Cleaning up SVN structure, moving branch under sca-cpp/branches.

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

1115 files changed, 0 insertions, 0 deletions

diff --git a/branches/cpp-M1/build.sh b/sca-cpp/branches/cpp-M1/build.sh
index bb049617bb..bb049617bb 100755
--- a/branches/cpp-M1/build.sh
+++ b/sca-cpp/branches/cpp-M1/build.sh
diff --git a/branches/cpp-M1/build.txt b/sca-cpp/branches/cpp-M1/build.txt
index 2158457d6e..2158457d6e 100644
--- a/branches/cpp-M1/build.txt
+++ b/sca-cpp/branches/cpp-M1/build.txt
diff --git a/branches/cpp-M1/build_tuscany_sca.bat b/sca-cpp/branches/cpp-M1/build_tuscany_sca.bat
index 6da1b0de19..6da1b0de19 100644
--- a/branches/cpp-M1/build_tuscany_sca.bat
+++ b/sca-cpp/branches/cpp-M1/build_tuscany_sca.bat
diff --git a/branches/cpp-M1/build_tuscany_sdo.bat b/sca-cpp/branches/cpp-M1/build_tuscany_sdo.bat
index 11e095faf1..11e095faf1 100644
--- a/branches/cpp-M1/build_tuscany_sdo.bat
+++ b/sca-cpp/branches/cpp-M1/build_tuscany_sdo.bat
diff --git a/branches/cpp-M1/sca/AUTHORS b/sca-cpp/branches/cpp-M1/sca/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/branches/cpp-M1/sca/AUTHORS
+++ b/sca-cpp/branches/cpp-M1/sca/AUTHORS
diff --git a/branches/cpp-M1/sca/COPYING b/sca-cpp/branches/cpp-M1/sca/COPYING
index 6b0b1270ff..6b0b1270ff 100755
--- a/branches/cpp-M1/sca/COPYING
+++ b/sca-cpp/branches/cpp-M1/sca/COPYING
diff --git a/branches/cpp-M1/sca/ChangeLog b/sca-cpp/branches/cpp-M1/sca/ChangeLog
index e69de29bb2..e69de29bb2 100644
--- a/branches/cpp-M1/sca/ChangeLog
+++ b/sca-cpp/branches/cpp-M1/sca/ChangeLog
diff --git a/branches/cpp-M1/sca/Developers Guide.txt b/sca-cpp/branches/cpp-M1/sca/Developers Guide.txt
index 96b0476174..96b0476174 100644
--- a/branches/cpp-M1/sca/Developers Guide.txt
+++ b/sca-cpp/branches/cpp-M1/sca/Developers Guide.txt
diff --git a/branches/cpp-M1/sca/GettingStarted.html b/sca-cpp/branches/cpp-M1/sca/GettingStarted.html
index 3ebffdf566..3ebffdf566 100644
--- a/branches/cpp-M1/sca/GettingStarted.html
+++ b/sca-cpp/branches/cpp-M1/sca/GettingStarted.html
diff --git a/branches/cpp-M1/sca/INSTALL b/sca-cpp/branches/cpp-M1/sca/INSTALL
index 9e0a0b758a..9e0a0b758a 100644
--- a/branches/cpp-M1/sca/INSTALL
+++ b/sca-cpp/branches/cpp-M1/sca/INSTALL
diff --git a/branches/cpp-M1/sca/LICENSE b/sca-cpp/branches/cpp-M1/sca/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/branches/cpp-M1/sca/LICENSE
+++ b/sca-cpp/branches/cpp-M1/sca/LICENSE
diff --git a/branches/cpp-M1/sca/Makefile.am b/sca-cpp/branches/cpp-M1/sca/Makefile.am
index 3fd18bc820..3fd18bc820 100644
--- a/branches/cpp-M1/sca/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/Makefile.am
diff --git a/branches/cpp-M1/sca/NEWS b/sca-cpp/branches/cpp-M1/sca/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/branches/cpp-M1/sca/NEWS
+++ b/sca-cpp/branches/cpp-M1/sca/NEWS
diff --git a/branches/cpp-M1/sca/NOTICE b/sca-cpp/branches/cpp-M1/sca/NOTICE
index bfb81409ad..bfb81409ad 100644
--- a/branches/cpp-M1/sca/NOTICE
+++ b/sca-cpp/branches/cpp-M1/sca/NOTICE
diff --git a/branches/cpp-M1/sca/README b/sca-cpp/branches/cpp-M1/sca/README
index a286dca6e3..a286dca6e3 100644
--- a/branches/cpp-M1/sca/README
+++ b/sca-cpp/branches/cpp-M1/sca/README
diff --git a/branches/cpp-M1/sca/autogen.sh b/sca-cpp/branches/cpp-M1/sca/autogen.sh
index 3cebb0a380..3cebb0a380 100755
--- a/branches/cpp-M1/sca/autogen.sh
+++ b/sca-cpp/branches/cpp-M1/sca/autogen.sh
diff --git a/branches/cpp-M1/sca/build.bat b/sca-cpp/branches/cpp-M1/sca/build.bat
index 2f6ece9b33..2f6ece9b33 100644
--- a/branches/cpp-M1/sca/build.bat
+++ b/sca-cpp/branches/cpp-M1/sca/build.bat
diff --git a/branches/cpp-M1/sca/build.sh b/sca-cpp/branches/cpp-M1/sca/build.sh
index cf94f1489d..cf94f1489d 100755
--- a/branches/cpp-M1/sca/build.sh
+++ b/sca-cpp/branches/cpp-M1/sca/build.sh
diff --git a/branches/cpp-M1/sca/configure.ac b/sca-cpp/branches/cpp-M1/sca/configure.ac
index 6f448cf832..6f448cf832 100644
--- a/branches/cpp-M1/sca/configure.ac
+++ b/sca-cpp/branches/cpp-M1/sca/configure.ac
diff --git a/branches/cpp-M1/sca/doc/CreatingSCACPPComponents.txt b/sca-cpp/branches/cpp-M1/sca/doc/CreatingSCACPPComponents.txt
index 17f6430b79..17f6430b79 100644
--- a/branches/cpp-M1/sca/doc/CreatingSCACPPComponents.txt
+++ b/sca-cpp/branches/cpp-M1/sca/doc/CreatingSCACPPComponents.txt
diff --git a/branches/cpp-M1/sca/doc/WSEntrypoint.txt b/sca-cpp/branches/cpp-M1/sca/doc/WSEntrypoint.txt
index 7e59008cae..7e59008cae 100644
--- a/branches/cpp-M1/sca/doc/WSEntrypoint.txt
+++ b/sca-cpp/branches/cpp-M1/sca/doc/WSEntrypoint.txt
diff --git a/branches/cpp-M1/sca/doc/css/maven-base.css b/sca-cpp/branches/cpp-M1/sca/doc/css/maven-base.css
index 314da3a272..314da3a272 100644
--- a/branches/cpp-M1/sca/doc/css/maven-base.css
+++ b/sca-cpp/branches/cpp-M1/sca/doc/css/maven-base.css
diff --git a/branches/cpp-M1/sca/doc/css/maven-theme.css b/sca-cpp/branches/cpp-M1/sca/doc/css/maven-theme.css
index 5c8e7b4abf..5c8e7b4abf 100644
--- a/branches/cpp-M1/sca/doc/css/maven-theme.css
+++ b/sca-cpp/branches/cpp-M1/sca/doc/css/maven-theme.css
diff --git a/branches/cpp-M1/sca/makebindist.sh b/sca-cpp/branches/cpp-M1/sca/makebindist.sh
index 8a274dc407..8a274dc407 100755
--- a/branches/cpp-M1/sca/makebindist.sh
+++ b/sca-cpp/branches/cpp-M1/sca/makebindist.sh
diff --git a/branches/cpp-M1/sca/makedist.sh b/sca-cpp/branches/cpp-M1/sca/makedist.sh
index b90ce68489..b90ce68489 100755
--- a/branches/cpp-M1/sca/makedist.sh
+++ b/sca-cpp/branches/cpp-M1/sca/makedist.sh
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/build.cmd b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/build.cmd
index cd1a2eeaae..cd1a2eeaae 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/build.cmd
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/build.cmd
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca.dsw b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca.dsw
index 89d7942d77..89d7942d77 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca.dsw
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca.dsw
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca.ncb b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca.ncb
index dc29a53257..dc29a53257 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca.ncb
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca.ncb
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca.opt b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca.opt
index 3a2046245e..3a2046245e 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca.opt
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca.opt
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca/Build Instructions.txt b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca/Build Instructions.txt
index 9f298f0707..9f298f0707 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca/Build Instructions.txt
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca/Build Instructions.txt
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.dsp b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.dsp
index c898f3da3f..c898f3da3f 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.dsp
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.dsp
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.mak b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.mak
index e711264c36..e711264c36 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.mak
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca/tuscany_sca.mak
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.fragment b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.fragment
index c2c521ed96..c2c521ed96 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.fragment
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.fragment
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfoImpl.componentType b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfoImpl.componentType
index 48651b63fe..48651b63fe 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfoImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfoImpl.componentType
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueImpl.componentType b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueImpl.componentType
index ace4154966..ace4154966 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueImpl.componentType
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueService.wsdl b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueService.wsdl
index f82690e1ab..f82690e1ab 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueService.wsdl
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueService.wsdl
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteService.wsdl b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteService.wsdl
index 26e2ea5cb8..26e2ea5cb8 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteService.wsdl
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteService.wsdl
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteTypes.xsd b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteTypes.xsd
index 5bce3a63dc..5bce3a63dc 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteTypes.xsd
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteTypes.xsd
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/Tuscany-model.config b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/Tuscany-model.config
index a23cc3f5cd..a23cc3f5cd 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/Tuscany-model.config
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/Tuscany-model.config
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/sca.module b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/sca.module
index 8cc39ce7bb..8cc39ce7bb 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/sca.module
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem
index 1b32bf8a93..1b32bf8a93 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.dsp b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.dsp
index 1929fbfc7a..1929fbfc7a 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.dsp
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.dsp
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.mak b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.mak
index d643484ff4..d643484ff4 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.mak
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.mak
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test_CustomerInfo/tuscany_sca_test_CustomerInfo.dsp b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test_CustomerInfo/tuscany_sca_test_CustomerInfo.dsp
index 53677c939e..53677c939e 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test_CustomerInfo/tuscany_sca_test_CustomerInfo.dsp
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test_CustomerInfo/tuscany_sca_test_CustomerInfo.dsp
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test_CustomerInfo/tuscany_sca_test_CustomerInfo.mak b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test_CustomerInfo/tuscany_sca_test_CustomerInfo.mak
index 289fec0deb..289fec0deb 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test_CustomerInfo/tuscany_sca_test_CustomerInfo.mak
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test_CustomerInfo/tuscany_sca_test_CustomerInfo.mak
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test_MyValue/tuscany_sca_test_MyValue.dsp b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test_MyValue/tuscany_sca_test_MyValue.dsp
index 83a980a9a2..83a980a9a2 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test_MyValue/tuscany_sca_test_MyValue.dsp
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test_MyValue/tuscany_sca_test_MyValue.dsp
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test_MyValue/tuscany_sca_test_MyValue.mak b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test_MyValue/tuscany_sca_test_MyValue.mak
index 1bd49a885b..1bd49a885b 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test_MyValue/tuscany_sca_test_MyValue.mak
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_test_MyValue/tuscany_sca_test_MyValue.mak
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.dsp b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.dsp
index c25fdb3536..c25fdb3536 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.dsp
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.dsp
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.mak b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.mak
index 49674c1f23..49674c1f23 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.mak
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.mak
diff --git a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_ws_service_axis2/tuscany_sca_ws_service_axis2.vcproj b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_ws_service_axis2/tuscany_sca_ws_service_axis2.vcproj
index 39e90539a3..39e90539a3 100644
--- a/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_ws_service_axis2/tuscany_sca_ws_service_axis2.vcproj
+++ b/sca-cpp/branches/cpp-M1/sca/projects/tuscany_sca/tuscany_sca_ws_service_axis2/tuscany_sca_ws_service_axis2.vcproj
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca.sln b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca.sln
index ec07ab3877..ec07ab3877 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca.sln
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca.sln
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca.suo b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca.suo
index 71c843b643..71c843b643 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca.suo
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca.suo
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca/Build Instructions.txt b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca/Build Instructions.txt
index 847dd5d492..847dd5d492 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca/Build Instructions.txt
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca/Build Instructions.txt
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj
index a83144e12a..a83144e12a 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.dll b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.dll
index 4ca1690be8..4ca1690be8 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.dll
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.dll
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.fragment b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.fragment
index c2c521ed96..c2c521ed96 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.fragment
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.fragment
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.pdb b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.pdb
index 61869285b1..61869285b1 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.pdb
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.pdb
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfoImpl.componentType b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfoImpl.componentType
index 48651b63fe..48651b63fe 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfoImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfoImpl.componentType
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValue.dll b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValue.dll
index e651ea0adb..e651ea0adb 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValue.dll
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValue.dll
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValue.pdb b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValue.pdb
index 76b5bef92f..76b5bef92f 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValue.pdb
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValue.pdb
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueImpl.componentType b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueImpl.componentType
index ace4154966..ace4154966 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueImpl.componentType
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueService.wsdl b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueService.wsdl
index f82690e1ab..f82690e1ab 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueService.wsdl
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueService.wsdl
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteService.wsdl b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteService.wsdl
index 26e2ea5cb8..26e2ea5cb8 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteService.wsdl
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteService.wsdl
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteTypes.xsd b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteTypes.xsd
index 5bce3a63dc..5bce3a63dc 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteTypes.xsd
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteTypes.xsd
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/Tuscany-model.config b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/Tuscany-model.config
index a23cc3f5cd..a23cc3f5cd 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/Tuscany-model.config
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/Tuscany-model.config
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/sca.module b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/sca.module
index 8cc39ce7bb..8cc39ce7bb 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/sca.module
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem
index 1b32bf8a93..1b32bf8a93 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/tuscany_sca_test.vcproj b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/tuscany_sca_test.vcproj
index 1a1fc48b50..1a1fc48b50 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/tuscany_sca_test.vcproj
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/tuscany_sca_test.vcproj
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test_CustomerInfo/tuscany_sca_test_CustomerInfo.vcproj b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test_CustomerInfo/tuscany_sca_test_CustomerInfo.vcproj
index 2bbb8e4cba..2bbb8e4cba 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test_CustomerInfo/tuscany_sca_test_CustomerInfo.vcproj
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test_CustomerInfo/tuscany_sca_test_CustomerInfo.vcproj
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test_MyValue/tuscany_sca_test_MyValue.vcproj b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test_MyValue/tuscany_sca_test_MyValue.vcproj
index 7272352508..7272352508 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test_MyValue/tuscany_sca_test_MyValue.vcproj
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test_MyValue/tuscany_sca_test_MyValue.vcproj
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj
index 1619337c8f..1619337c8f 100644
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj
+++ b/sca-cpp/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj
diff --git a/branches/cpp-M1/sca/runtime/Makefile.am b/sca-cpp/branches/cpp-M1/sca/runtime/Makefile.am
index 8cd99f1477..8cd99f1477 100644
--- a/branches/cpp-M1/sca/runtime/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/Makefile.am
diff --git a/branches/cpp-M1/sca/runtime/core/Makefile.am b/sca-cpp/branches/cpp-M1/sca/runtime/core/Makefile.am
index b4b5bc3097..b4b5bc3097 100644
--- a/branches/cpp-M1/sca/runtime/core/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/Makefile.am
diff --git a/branches/cpp-M1/sca/runtime/core/src/Makefile.am b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/Makefile.am
index 305bbe5504..305bbe5504 100644
--- a/branches/cpp-M1/sca/runtime/core/src/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/Makefile.am
diff --git a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ComponentContext.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ComponentContext.cpp
index 73c3ed2e36..73c3ed2e36 100644
--- a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ComponentContext.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ComponentContext.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ComponentContext.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ComponentContext.h
index 10d334a936..10d334a936 100644
--- a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ComponentContext.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ComponentContext.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ComponentContextImpl.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ComponentContextImpl.cpp
index 436e44d5e1..436e44d5e1 100644
--- a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ComponentContextImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ComponentContextImpl.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ComponentContextImpl.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ComponentContextImpl.h
index bd3a0d106a..bd3a0d106a 100644
--- a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ComponentContextImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ComponentContextImpl.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ModuleContext.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ModuleContext.cpp
index 93e36b297f..93e36b297f 100644
--- a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ModuleContext.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ModuleContext.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ModuleContext.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ModuleContext.h
index 7aacb00123..7aacb00123 100644
--- a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ModuleContext.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ModuleContext.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ModuleContextImpl.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ModuleContextImpl.cpp
index 4d96ee336d..4d96ee336d 100644
--- a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ModuleContextImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ModuleContextImpl.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ModuleContextImpl.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ModuleContextImpl.h
index 5950313a06..5950313a06 100644
--- a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ModuleContextImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ModuleContextImpl.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/SCA.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/SCA.cpp
index bcca254028..bcca254028 100644
--- a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/SCA.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/SCA.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ServiceList.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ServiceList.cpp
index ba2b418a7c..ba2b418a7c 100644
--- a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ServiceList.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ServiceList.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ServiceList.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ServiceList.h
index be6f6c9b1a..be6f6c9b1a 100644
--- a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ServiceList.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ServiceList.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ServiceRuntimeException.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ServiceRuntimeException.cpp
index 9f275c9c10..9f275c9c10 100644
--- a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ServiceRuntimeException.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ServiceRuntimeException.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ServiceRuntimeException.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ServiceRuntimeException.h
index 7de44f84d7..7de44f84d7 100644
--- a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ServiceRuntimeException.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/ServiceRuntimeException.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/export.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/export.h
index 6ef7960284..6ef7960284 100644
--- a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/export.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/export.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/sca.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/sca.h
index 528bd91c4a..528bd91c4a 100644
--- a/branches/cpp-M1/sca/runtime/core/src/osoa/sca/sca.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/osoa/sca/sca.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ComponentServiceWrapper.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ComponentServiceWrapper.cpp
index 65d218dc86..65d218dc86 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ComponentServiceWrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ComponentServiceWrapper.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ComponentServiceWrapper.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ComponentServiceWrapper.h
index 3a5e990bf0..3a5e990bf0 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ComponentServiceWrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ComponentServiceWrapper.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ExternalServiceWrapper.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ExternalServiceWrapper.cpp
index 2838bbe4d4..2838bbe4d4 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ExternalServiceWrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ExternalServiceWrapper.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ExternalServiceWrapper.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ExternalServiceWrapper.h
index b2dcfb3a6b..b2dcfb3a6b 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ExternalServiceWrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ExternalServiceWrapper.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/Operation.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/Operation.cpp
index 981f4e6d9e..981f4e6d9e 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/Operation.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/Operation.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/Operation.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/Operation.h
index e562dca3c1..e562dca3c1 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/Operation.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/Operation.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/SCAEntryPoint.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/SCAEntryPoint.cpp
index 63a7d52e7a..63a7d52e7a 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/SCAEntryPoint.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/SCAEntryPoint.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/SCAEntryPoint.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/SCAEntryPoint.h
index 6c1df3e28e..6c1df3e28e 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/SCAEntryPoint.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/SCAEntryPoint.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
index 9da3e547e9..9da3e547e9 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/SCARuntime.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/SCARuntime.h
index 2b81b2cbcd..2b81b2cbcd 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/SCARuntime.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/SCARuntime.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
index ef2f2744eb..ef2f2744eb 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.h
index 073b379cd7..073b379cd7 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ServiceProxy.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp
index 5936f526f1..5936f526f1 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.h
index 21c162d77f..21c162d77f 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/ServiceWrapper.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.cpp
index 810f810132..810f810132 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.h
index 92da737416..92da737416 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/core/TuscanyRuntime.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Binding.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Binding.cpp
index c312d7a077..c312d7a077 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Binding.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Binding.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Binding.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Binding.h
index ff97990dc6..ff97990dc6 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Binding.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Binding.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/CPPImplementation.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/CPPImplementation.cpp
index 7212e777b1..7212e777b1 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/CPPImplementation.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/CPPImplementation.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/CPPImplementation.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/CPPImplementation.h
index 0294649af7..0294649af7 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/CPPImplementation.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/CPPImplementation.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/CPPInterface.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/CPPInterface.cpp
index 015b54c259..015b54c259 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/CPPInterface.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/CPPInterface.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/CPPInterface.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/CPPInterface.h
index 7b37b1892e..7b37b1892e 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/CPPInterface.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/CPPInterface.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Component.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Component.cpp
index 4e0cf81c61..4e0cf81c61 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Component.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Component.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Component.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Component.h
index f40690c859..f40690c859 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Component.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Component.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/EntryPoint.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/EntryPoint.cpp
index 1c38e31469..1c38e31469 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/EntryPoint.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/EntryPoint.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/EntryPoint.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/EntryPoint.h
index 9b80a1049f..9b80a1049f 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/EntryPoint.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/EntryPoint.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ExternalService.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ExternalService.cpp
index c848c3aafb..c848c3aafb 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ExternalService.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ExternalService.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ExternalService.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ExternalService.h
index fe9640d1b8..fe9640d1b8 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ExternalService.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ExternalService.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Implementation.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Implementation.cpp
index 9703d1bab3..9703d1bab3 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Implementation.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Implementation.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Implementation.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Implementation.h
index 17414c359b..17414c359b 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Implementation.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Implementation.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Interface.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Interface.cpp
index 9e0aa45889..9e0aa45889 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Interface.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Interface.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Interface.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Interface.h
index 24bb43224b..24bb43224b 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Interface.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Interface.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
index 32a3ad8d26..32a3ad8d26 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h
index 97478748e9..97478748e9 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ModelLoader.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Module.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Module.cpp
index fc8b6b1eb8..fc8b6b1eb8 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Module.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Module.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Module.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Module.h
index f73f1d36bc..f73f1d36bc 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Module.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Module.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Service.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Service.cpp
index 42ccecbc99..42ccecbc99 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Service.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Service.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Service.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Service.h
index 6c37dabb3e..6c37dabb3e 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Service.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Service.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ServiceReference.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ServiceReference.cpp
index cada38dec2..cada38dec2 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ServiceReference.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ServiceReference.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ServiceReference.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ServiceReference.h
index 062d7a4c19..062d7a4c19 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ServiceReference.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/ServiceReference.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Subsystem.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Subsystem.cpp
index 08ef0dde49..08ef0dde49 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Subsystem.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Subsystem.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Subsystem.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Subsystem.h
index b3c59898eb..b3c59898eb 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Subsystem.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Subsystem.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/System.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/System.cpp
index dfc4a21b1c..dfc4a21b1c 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/System.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/System.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/System.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/System.h
index a0f62ce67a..a0f62ce67a 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/System.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/System.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WSBinding.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WSBinding.cpp
index 85cb7482bd..85cb7482bd 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WSBinding.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WSBinding.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WSBinding.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WSBinding.h
index e7963d205b..e7963d205b 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WSBinding.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WSBinding.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Wire.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Wire.cpp
index 6c1b14940f..6c1b14940f 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Wire.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Wire.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Wire.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Wire.h
index b126137118..b126137118 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Wire.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Wire.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WireTarget.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WireTarget.cpp
index a35b07f5fe..a35b07f5fe 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WireTarget.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WireTarget.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WireTarget.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WireTarget.h
index 312d20a704..312d20a704 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WireTarget.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WireTarget.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Wsdl.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Wsdl.cpp
index d2ca9e96c1..d2ca9e96c1 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Wsdl.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Wsdl.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Wsdl.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Wsdl.h
index 70a07996cc..70a07996cc 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Wsdl.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/Wsdl.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WsdlOperation.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WsdlOperation.cpp
index 40964ea20e..40964ea20e 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WsdlOperation.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WsdlOperation.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WsdlOperation.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WsdlOperation.h
index 9fe22b6f57..9fe22b6f57 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WsdlOperation.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/model/WsdlOperation.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
index 3ea2212f7c..3ea2212f7c 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
index 4d45579907..4d45579907 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Exceptions.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Exceptions.h
index daad31f59f..daad31f59f 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Exceptions.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Exceptions.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/File.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/File.cpp
index 33e33d1aad..33e33d1aad 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/File.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/File.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/File.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/File.h
index f177401442..f177401442 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/File.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/File.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
index c3749c1be2..c3749c1be2 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h
index 4f230a8f0b..4f230a8f0b 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/FileLogWriter.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Library.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Library.cpp
index 0a50f396c7..0a50f396c7 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Library.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Library.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Library.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Library.h
index 69b2f5352a..69b2f5352a 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Library.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Library.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/LogWriter.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/LogWriter.cpp
index d77d1e4bfd..d77d1e4bfd 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/LogWriter.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/LogWriter.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/LogWriter.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/LogWriter.h
index edb07c3684..edb07c3684 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/LogWriter.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/LogWriter.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Logger.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Logger.cpp
index 0a888a69ef..0a888a69ef 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Logger.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Logger.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Logger.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Logger.h
index be5e47e02a..be5e47e02a 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Logger.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Logger.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Logging.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Logging.h
index 7e3a1a84ab..7e3a1a84ab 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Logging.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Logging.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Utils.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Utils.cpp
index 6417ed3da4..6417ed3da4 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Utils.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Utils.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Utils.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Utils.h
index 184bcd3dad..184bcd3dad 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Utils.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/util/Utils.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.cpp
index dcf974623d..dcf974623d 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.h
index 959a5ee07c..959a5ee07c 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.h
diff --git a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/ws/WSServiceWrapper.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/ws/WSServiceWrapper.h
index 713c575735..713c575735 100644
--- a/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/ws/WSServiceWrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/src/tuscany/sca/ws/WSServiceWrapper.h
diff --git a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/.cdtbuild b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/.cdtbuild
index ed308ead8d..ed308ead8d 100644
--- a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/.cdtbuild
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/.cdtbuild
diff --git a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/.cdtproject b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/.cdtproject
index 48a12e6664..48a12e6664 100644
--- a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/.cdtproject
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/.cdtproject
diff --git a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/.project b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/.project
index 60a0a75176..60a0a75176 100644
--- a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/.project
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/.project
diff --git a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/.settings/org.eclipse.cdt.managedbuilder.core.prefs
index 691a33706a..691a33706a 100644
--- a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/.settings/org.eclipse.cdt.managedbuilder.core.prefs
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/.settings/org.eclipse.cdt.managedbuilder.core.prefs
diff --git a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfo.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfo.h
index 6372a5a45a..6372a5a45a 100644
--- a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfo.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfo.h
diff --git a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl.cpp
index 371ab74f14..371ab74f14 100644
--- a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl.h
index 7f70664f68..7f70664f68 100644
--- a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl.h
diff --git a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index e6cb3b3426..e6cb3b3426 100644
--- a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl_CustomerInfoService_Proxy.h
index 7173dacd34..7173dacd34 100644
--- a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index 1f28bf5715..1f28bf5715 100644
--- a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 5fb82c4295..5fb82c4295 100644
--- a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/Makefile.am b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/Makefile.am
index baf839d51a..baf839d51a 100644
--- a/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/CustomerInfo/Makefile.am
diff --git a/branches/cpp-M1/sca/runtime/core/test/Makefile.am b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/Makefile.am
index 52ea80e3fb..52ea80e3fb 100644
--- a/branches/cpp-M1/sca/runtime/core/test/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/Makefile.am
diff --git a/branches/cpp-M1/sca/runtime/core/test/MyValue/.cdtbuild b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/.cdtbuild
index acc65c20f2..acc65c20f2 100644
--- a/branches/cpp-M1/sca/runtime/core/test/MyValue/.cdtbuild
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/.cdtbuild
diff --git a/branches/cpp-M1/sca/runtime/core/test/MyValue/.cdtproject b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/.cdtproject
index 48a12e6664..48a12e6664 100644
--- a/branches/cpp-M1/sca/runtime/core/test/MyValue/.cdtproject
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/.cdtproject
diff --git a/branches/cpp-M1/sca/runtime/core/test/MyValue/.project b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/.project
index 113442bfd8..113442bfd8 100644
--- a/branches/cpp-M1/sca/runtime/core/test/MyValue/.project
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/.project
diff --git a/branches/cpp-M1/sca/runtime/core/test/MyValue/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/.settings/org.eclipse.cdt.managedbuilder.core.prefs
index 4c585d5bb1..4c585d5bb1 100644
--- a/branches/cpp-M1/sca/runtime/core/test/MyValue/.settings/org.eclipse.cdt.managedbuilder.core.prefs
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/.settings/org.eclipse.cdt.managedbuilder.core.prefs
diff --git a/branches/cpp-M1/sca/runtime/core/test/MyValue/Makefile.am b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/Makefile.am
index 0eb5f89ad3..0eb5f89ad3 100644
--- a/branches/cpp-M1/sca/runtime/core/test/MyValue/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/Makefile.am
diff --git a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValue.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValue.h
index 710910f08c..710910f08c 100644
--- a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValue.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValue.h
diff --git a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl.cpp
index a6e10384e4..a6e10384e4 100644
--- a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl.h
index fa4053692e..fa4053692e 100644
--- a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl.h
diff --git a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_MyValueService_Proxy.cpp
index d34b63ea14..d34b63ea14 100644
--- a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_MyValueService_Proxy.h
index 742947ca69..742947ca69 100644
--- a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_MyValueService_Proxy.h
diff --git a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_MyValueService_Wrapper.cpp
index da60e4c1e3..da60e4c1e3 100644
--- a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_MyValueService_Wrapper.h
index 82fbcf76cc..82fbcf76cc 100644
--- a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_MyValueService_Wrapper.h
diff --git a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_customerInfo_Proxy.cpp
index cda55a99c8..cda55a99c8 100644
--- a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_customerInfo_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_customerInfo_Proxy.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_customerInfo_Proxy.h
index 6ac33b4ef6..6ac33b4ef6 100644
--- a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_customerInfo_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_customerInfo_Proxy.h
diff --git a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_stockQuote_Proxy.cpp
index 6b0e4df2d5..6b0e4df2d5 100644
--- a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_stockQuote_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_stockQuote_Proxy.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_stockQuote_Proxy.h
index 54b70fd684..54b70fd684 100644
--- a/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/MyValueImpl_stockQuote_Proxy.h
diff --git a/branches/cpp-M1/sca/runtime/core/test/MyValue/StockQuoteService.h b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/StockQuoteService.h
index e53f41c736..e53f41c736 100644
--- a/branches/cpp-M1/sca/runtime/core/test/MyValue/StockQuoteService.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/MyValue/StockQuoteService.h
diff --git a/branches/cpp-M1/sca/runtime/core/test/src/.cdtbuild b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/src/.cdtbuild
index 73f28e14fd..73f28e14fd 100644
--- a/branches/cpp-M1/sca/runtime/core/test/src/.cdtbuild
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/src/.cdtbuild
diff --git a/branches/cpp-M1/sca/runtime/core/test/src/.cdtproject b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/src/.cdtproject
index 48a12e6664..48a12e6664 100644
--- a/branches/cpp-M1/sca/runtime/core/test/src/.cdtproject
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/src/.cdtproject
diff --git a/branches/cpp-M1/sca/runtime/core/test/src/.project b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/src/.project
index 5e5b12e9d8..5e5b12e9d8 100644
--- a/branches/cpp-M1/sca/runtime/core/test/src/.project
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/src/.project
diff --git a/branches/cpp-M1/sca/runtime/core/test/src/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/src/.settings/org.eclipse.cdt.managedbuilder.core.prefs
index fe629d7d5b..fe629d7d5b 100644
--- a/branches/cpp-M1/sca/runtime/core/test/src/.settings/org.eclipse.cdt.managedbuilder.core.prefs
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/src/.settings/org.eclipse.cdt.managedbuilder.core.prefs
diff --git a/branches/cpp-M1/sca/runtime/core/test/src/Makefile.am b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/src/Makefile.am
index e9a449aaf0..e9a449aaf0 100644
--- a/branches/cpp-M1/sca/runtime/core/test/src/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/src/Makefile.am
diff --git a/branches/cpp-M1/sca/runtime/core/test/src/TestSCA.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/src/TestSCA.cpp
index 489fdab622..489fdab622 100644
--- a/branches/cpp-M1/sca/runtime/core/test/src/TestSCA.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/src/TestSCA.cpp
diff --git a/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.fragment b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.fragment
index f473f59748..f473f59748 100644
--- a/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.fragment
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.fragment
diff --git a/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/CustomerInfoImpl.componentType b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/CustomerInfoImpl.componentType
index 48651b63fe..48651b63fe 100644
--- a/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/CustomerInfoImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/CustomerInfoImpl.componentType
diff --git a/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/MyValueImpl.componentType b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/MyValueImpl.componentType
index ace4154966..ace4154966 100644
--- a/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/MyValueImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/MyValueImpl.componentType
diff --git a/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/StockQuoteService.wsdl b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/StockQuoteService.wsdl
index 5bce10d2f9..5bce10d2f9 100644
--- a/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/StockQuoteService.wsdl
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/StockQuoteService.wsdl
diff --git a/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/StockQuoteTypes.xsd b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/StockQuoteTypes.xsd
index 5bce3a63dc..5bce3a63dc 100644
--- a/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/StockQuoteTypes.xsd
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/StockQuoteTypes.xsd
diff --git a/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/Tuscany-model.config b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/Tuscany-model.config
index cba35b444b..cba35b444b 100644
--- a/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/Tuscany-model.config
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/Tuscany-model.config
diff --git a/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/sca.module b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/sca.module
index b9b9b51036..b9b9b51036 100644
--- a/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/testSCASystem/modules/MyValueServiceModule/sca.module
diff --git a/branches/cpp-M1/sca/runtime/core/test/testSCASystem/subsystems/SubSystem1/sca.subsystem b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/testSCASystem/subsystems/SubSystem1/sca.subsystem
index 1b32bf8a93..1b32bf8a93 100644
--- a/branches/cpp-M1/sca/runtime/core/test/testSCASystem/subsystems/SubSystem1/sca.subsystem
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/core/test/testSCASystem/subsystems/SubSystem1/sca.subsystem
diff --git a/branches/cpp-M1/sca/runtime/ws_reference/Makefile.am b/sca-cpp/branches/cpp-M1/sca/runtime/ws_reference/Makefile.am
index f3ba006041..f3ba006041 100644
--- a/branches/cpp-M1/sca/runtime/ws_reference/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/ws_reference/Makefile.am
diff --git a/branches/cpp-M1/sca/runtime/ws_reference/axis2c/Makefile.am b/sca-cpp/branches/cpp-M1/sca/runtime/ws_reference/axis2c/Makefile.am
index af437a64d6..af437a64d6 100644
--- a/branches/cpp-M1/sca/runtime/ws_reference/axis2c/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/ws_reference/axis2c/Makefile.am
diff --git a/branches/cpp-M1/sca/runtime/ws_reference/axis2c/src/Axis2Client.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/ws_reference/axis2c/src/Axis2Client.cpp
index 4064235062..4064235062 100644
--- a/branches/cpp-M1/sca/runtime/ws_reference/axis2c/src/Axis2Client.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/ws_reference/axis2c/src/Axis2Client.cpp
diff --git a/branches/cpp-M1/sca/runtime/ws_reference/axis2c/src/Axis2Client.h b/sca-cpp/branches/cpp-M1/sca/runtime/ws_reference/axis2c/src/Axis2Client.h
index c07e1fee4e..c07e1fee4e 100644
--- a/branches/cpp-M1/sca/runtime/ws_reference/axis2c/src/Axis2Client.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/ws_reference/axis2c/src/Axis2Client.h
diff --git a/branches/cpp-M1/sca/runtime/ws_reference/axis2c/src/Makefile.am b/sca-cpp/branches/cpp-M1/sca/runtime/ws_reference/axis2c/src/Makefile.am
index 60678dd31b..60678dd31b 100644
--- a/branches/cpp-M1/sca/runtime/ws_reference/axis2c/src/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/ws_reference/axis2c/src/Makefile.am
diff --git a/branches/cpp-M1/sca/runtime/ws_reference/axis2c/src/WSServiceWrapper.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/ws_reference/axis2c/src/WSServiceWrapper.cpp
index 2a4d6a1d8d..2a4d6a1d8d 100644
--- a/branches/cpp-M1/sca/runtime/ws_reference/axis2c/src/WSServiceWrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/ws_reference/axis2c/src/WSServiceWrapper.cpp
diff --git a/branches/cpp-M1/sca/runtime/ws_service/Makefile.am b/sca-cpp/branches/cpp-M1/sca/runtime/ws_service/Makefile.am
index f3ba006041..f3ba006041 100644
--- a/branches/cpp-M1/sca/runtime/ws_service/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/ws_service/Makefile.am
diff --git a/branches/cpp-M1/sca/runtime/ws_service/axis2c/Makefile.am b/sca-cpp/branches/cpp-M1/sca/runtime/ws_service/axis2c/Makefile.am
index af437a64d6..af437a64d6 100644
--- a/branches/cpp-M1/sca/runtime/ws_service/axis2c/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/ws_service/axis2c/Makefile.am
diff --git a/branches/cpp-M1/sca/runtime/ws_service/axis2c/src/Axis2EntryPointService_skeleton.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/ws_service/axis2c/src/Axis2EntryPointService_skeleton.cpp
index c2a06e05c0..c2a06e05c0 100644
--- a/branches/cpp-M1/sca/runtime/ws_service/axis2c/src/Axis2EntryPointService_skeleton.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/ws_service/axis2c/src/Axis2EntryPointService_skeleton.cpp
diff --git a/branches/cpp-M1/sca/runtime/ws_service/axis2c/src/Axis2Utils.cpp b/sca-cpp/branches/cpp-M1/sca/runtime/ws_service/axis2c/src/Axis2Utils.cpp
index 7007e71c96..7007e71c96 100644
--- a/branches/cpp-M1/sca/runtime/ws_service/axis2c/src/Axis2Utils.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/ws_service/axis2c/src/Axis2Utils.cpp
diff --git a/branches/cpp-M1/sca/runtime/ws_service/axis2c/src/Axis2Utils.h b/sca-cpp/branches/cpp-M1/sca/runtime/ws_service/axis2c/src/Axis2Utils.h
index a998ed8682..a998ed8682 100644
--- a/branches/cpp-M1/sca/runtime/ws_service/axis2c/src/Axis2Utils.h
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/ws_service/axis2c/src/Axis2Utils.h
diff --git a/branches/cpp-M1/sca/runtime/ws_service/axis2c/src/Makefile.am b/sca-cpp/branches/cpp-M1/sca/runtime/ws_service/axis2c/src/Makefile.am
index 22bf2f2276..22bf2f2276 100644
--- a/branches/cpp-M1/sca/runtime/ws_service/axis2c/src/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/runtime/ws_service/axis2c/src/Makefile.am
diff --git a/branches/cpp-M1/sca/samples/AUTHORS b/sca-cpp/branches/cpp-M1/sca/samples/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/branches/cpp-M1/sca/samples/AUTHORS
+++ b/sca-cpp/branches/cpp-M1/sca/samples/AUTHORS
diff --git a/branches/cpp-M1/sca/samples/BigBank/AccountClient/AccountClient.cpp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/AccountClient/AccountClient.cpp
index 004c02fd9e..004c02fd9e 100644
--- a/branches/cpp-M1/sca/samples/BigBank/AccountClient/AccountClient.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/AccountClient/AccountClient.cpp
diff --git a/branches/cpp-M1/sca/samples/BigBank/AccountClient/AccountClient.dsp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/AccountClient/AccountClient.dsp
index cf1c043ae2..cf1c043ae2 100644
--- a/branches/cpp-M1/sca/samples/BigBank/AccountClient/AccountClient.dsp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/AccountClient/AccountClient.dsp
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataService.h b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataService.h
index 1603ed2ccb..1603ed2ccb 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataService.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataService.h
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl.componentType b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl.componentType
index 740f9b01d6..740f9b01d6 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl.componentType
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl.cpp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl.cpp
index ec72b4d5b9..ec72b4d5b9 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl.cpp
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl.h b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl.h
index 6423c58795..6423c58795 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl.h
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl_AccountDataService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl_AccountDataService_Proxy.cpp
index dbc1588881..dbc1588881 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl_AccountDataService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl_AccountDataService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl_AccountDataService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl_AccountDataService_Proxy.h
index c86af7e128..c86af7e128 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl_AccountDataService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl_AccountDataService_Proxy.h
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl_AccountDataService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl_AccountDataService_Wrapper.cpp
index 424ea7fdfb..424ea7fdfb 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl_AccountDataService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl_AccountDataService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl_AccountDataService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl_AccountDataService_Wrapper.h
index af43114af0..af43114af0 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl_AccountDataService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountDataServiceImpl_AccountDataService_Wrapper.h
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountService.h b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountService.h
index eb1a585c52..eb1a585c52 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountService.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountService.h
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountService.wsdl b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountService.wsdl
index 9362ab56c0..9362ab56c0 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountService.wsdl
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountService.wsdl
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl.componenttype b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl.componenttype
index 7ab7736069..7ab7736069 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl.componenttype
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl.componenttype
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl.cpp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl.cpp
index c78b5963bf..c78b5963bf 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl.cpp
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl.h b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl.h
index 1e506f1ed1..1e506f1ed1 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl.h
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountDataService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountDataService_Proxy.cpp
index a0441b213a..a0441b213a 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountDataService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountDataService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountDataService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountDataService_Proxy.h
index ff5c6e6d87..ff5c6e6d87 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountDataService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountDataService_Proxy.h
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountService_Proxy.cpp
index 1684266b3e..1684266b3e 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountService_Proxy.h
index 3b5df16198..3b5df16198 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountService_Proxy.h
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountService_Wrapper.cpp
index 1b97e5c4d0..1b97e5c4d0 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountService_Wrapper.h
index 9dce3fd05d..9dce3fd05d 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_AccountService_Wrapper.h
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_stockQuote_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_stockQuote_Proxy.cpp
index be1b432353..be1b432353 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_stockQuote_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_stockQuote_Proxy.cpp
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_stockQuote_Proxy.h b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_stockQuote_Proxy.h
index d63d507bf4..d63d507bf4 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_stockQuote_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/AccountServiceImpl_stockQuote_Proxy.h
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/Accounts.dsp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/Accounts.dsp
index 52c450a2bd..52c450a2bd 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/Accounts.dsp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/Accounts.dsp
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteExternalService.h b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteExternalService.h
index d8df90651d..d8df90651d 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteExternalService.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteExternalService.h
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteService.h b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteService.h
index cd61d4c4d2..cd61d4c4d2 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteService.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteService.h
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteService.wsdl b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteService.wsdl
index ba6caff22c..ba6caff22c 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteService.wsdl
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteService.wsdl
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl.componentType b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl.componentType
index 92e46f2638..92e46f2638 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl.componentType
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl.cpp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl.cpp
index 8ce6d410c2..8ce6d410c2 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl.cpp
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl.h b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl.h
index 7611984e4e..7611984e4e 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl.h
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteExternal_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteExternal_Proxy.cpp
index b618dd4a33..b618dd4a33 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteExternal_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteExternal_Proxy.cpp
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteExternal_Proxy.h b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteExternal_Proxy.h
index 45469174ce..45469174ce 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteExternal_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteExternal_Proxy.h
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteService_Proxy.cpp
index 43dabb5307..43dabb5307 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteService_Proxy.h
index e1b0ad1807..e1b0ad1807 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteService_Proxy.h
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteService_Wrapper.cpp
index 00ac26c784..00ac26c784 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteService_Wrapper.h
index a6d8580e5e..a6d8580e5e 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/StockQuoteServiceImpl_StockQuoteService_Wrapper.h
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/sca.module b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/sca.module
index 8560a3cb72..8560a3cb72 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/sca.module
diff --git a/branches/cpp-M1/sca/samples/BigBank/Accounts/sca.subsystem b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/sca.subsystem
index faaa828bf9..faaa828bf9 100644
--- a/branches/cpp-M1/sca/samples/BigBank/Accounts/sca.subsystem
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/Accounts/sca.subsystem
diff --git a/branches/cpp-M1/sca/samples/BigBank/BigBank.dsw b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/BigBank.dsw
index 42d7f5a82e..42d7f5a82e 100644
--- a/branches/cpp-M1/sca/samples/BigBank/BigBank.dsw
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/BigBank.dsw
diff --git a/branches/cpp-M1/sca/samples/BigBank/BigBank.ncb b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/BigBank.ncb
index 8b4beb8420..8b4beb8420 100644
--- a/branches/cpp-M1/sca/samples/BigBank/BigBank.ncb
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/BigBank.ncb
diff --git a/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/Tuscany-model.config b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/Tuscany-model.config
index 41a4ec3ebb..41a4ec3ebb 100644
--- a/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/Tuscany-model.config
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/Tuscany-model.config
diff --git a/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/WSAccountClient.cpp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/WSAccountClient.cpp
index f794dc6112..f794dc6112 100644
--- a/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/WSAccountClient.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/WSAccountClient.cpp
diff --git a/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/WSAccountClient.dsp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/WSAccountClient.dsp
index db382db6ff..db382db6ff 100644
--- a/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/WSAccountClient.dsp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/WSAccountClient.dsp
diff --git a/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/axis2_Account_stub.cpp b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/axis2_Account_stub.cpp
index d9198b29ec..d9198b29ec 100644
--- a/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/axis2_Account_stub.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/axis2_Account_stub.cpp
diff --git a/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/axis2_Account_stub.h b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/axis2_Account_stub.h
index 53f07263b8..53f07263b8 100644
--- a/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/axis2_Account_stub.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/axis2_Account_stub.h
diff --git a/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/services.xml b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/services.xml
index bb57c6edb6..bb57c6edb6 100644
--- a/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/services.xml
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/WSAccountClient/services.xml
diff --git a/branches/cpp-M1/sca/samples/BigBank/deploy.bat b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/deploy.bat
index d88112556b..d88112556b 100644
--- a/branches/cpp-M1/sca/samples/BigBank/deploy.bat
+++ b/sca-cpp/branches/cpp-M1/sca/samples/BigBank/deploy.bat
diff --git a/branches/cpp-M1/sca/samples/COPYING b/sca-cpp/branches/cpp-M1/sca/samples/COPYING
index 6b0b1270ff..6b0b1270ff 100755
--- a/branches/cpp-M1/sca/samples/COPYING
+++ b/sca-cpp/branches/cpp-M1/sca/samples/COPYING
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/Calculator.h b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/Calculator.h
index 6f30e31550..6f30e31550 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/Calculator.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/Calculator.h
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/Calculator.wsdl b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/Calculator.wsdl
index 6ec2df52bd..6ec2df52bd 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/Calculator.wsdl
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/Calculator.wsdl
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl.componentType b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl.componentType
index 39d6698e02..39d6698e02 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl.componentType
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl.cpp b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl.cpp
index 746a1db689..746a1db689 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl.cpp
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl.h b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl.h
index 2e4b6aa4dc..2e4b6aa4dc 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl.h
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorDivideService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorDivideService_Proxy.cpp
index 0ff0891406..0ff0891406 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorDivideService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorDivideService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorDivideService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorDivideService_Proxy.h
index 3312005d32..3312005d32 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorDivideService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorDivideService_Proxy.h
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorService_Proxy.cpp
index c601ebcdc2..c601ebcdc2 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorService_Proxy.h
index d3de5a79c6..d3de5a79c6 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorService_Proxy.h
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorService_Wrapper.cpp
index 97805d0e4b..97805d0e4b 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorService_Wrapper.h
index c881576ca2..c881576ca2 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/CalculatorImpl_CalculatorService_Wrapper.h
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideService.h b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideService.h
index f6033c9020..f6033c9020 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideService.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideService.h
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl.componentType b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl.componentType
index bda8aed044..bda8aed044 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl.componentType
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl.cpp b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl.cpp
index 4797498103..4797498103 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl.cpp
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl.h b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl.h
index 00216b53b3..00216b53b3 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl.h
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl_DivideService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl_DivideService_Proxy.cpp
index 945f407327..945f407327 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl_DivideService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl_DivideService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl_DivideService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl_DivideService_Proxy.h
index 957ad43168..957ad43168 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl_DivideService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl_DivideService_Proxy.h
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl_DivideService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl_DivideService_Wrapper.cpp
index 4257caa46c..4257caa46c 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl_DivideService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl_DivideService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl_DivideService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl_DivideService_Wrapper.h
index 9be9796ee2..9be9796ee2 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl_DivideService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/DivideServiceImpl_DivideService_Wrapper.h
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/Makefile.am b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/Makefile.am
index aff769b36a..aff769b36a 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/Makefile.am
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/Tuscany-model.config b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/Tuscany-model.config
index b8f96a01a1..b8f96a01a1 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/Tuscany-model.config
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/Tuscany-model.config
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/sca.module b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/sca.module
index e07fbeb9e2..e07fbeb9e2 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/sca.module
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/sca.module.lin b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/sca.module.lin
index 4bd96ac774..4bd96ac774 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/sca.module.lin
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/sca.module.lin
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/services.xml b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/services.xml
index b5f234e988..b5f234e988 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/services.xml
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorModule/services.xml
diff --git a/branches/cpp-M1/sca/samples/Calculator/CalculatorSubsystem/sca.subsystem b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorSubsystem/sca.subsystem
index 4b9fdd1511..4b9fdd1511 100644
--- a/branches/cpp-M1/sca/samples/Calculator/CalculatorSubsystem/sca.subsystem
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/CalculatorSubsystem/sca.subsystem
diff --git a/branches/cpp-M1/sca/samples/Calculator/Client/Calc.cpp b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/Client/Calc.cpp
index 124cf96c63..124cf96c63 100644
--- a/branches/cpp-M1/sca/samples/Calculator/Client/Calc.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/Client/Calc.cpp
diff --git a/branches/cpp-M1/sca/samples/Calculator/Client/Calculator.h b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/Client/Calculator.h
index 57975548c1..57975548c1 100644
--- a/branches/cpp-M1/sca/samples/Calculator/Client/Calculator.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/Client/Calculator.h
diff --git a/branches/cpp-M1/sca/samples/Calculator/Client/Makefile.am b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/Client/Makefile.am
index 75052b5bc0..75052b5bc0 100644
--- a/branches/cpp-M1/sca/samples/Calculator/Client/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/Client/Makefile.am
diff --git a/branches/cpp-M1/sca/samples/Calculator/Client/readme.txt b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/Client/readme.txt
index 62672483af..62672483af 100644
--- a/branches/cpp-M1/sca/samples/Calculator/Client/readme.txt
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/Client/readme.txt
diff --git a/branches/cpp-M1/sca/samples/Calculator/Client/runclient.cmd b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/Client/runclient.cmd
index 1758d12ef5..1758d12ef5 100644
--- a/branches/cpp-M1/sca/samples/Calculator/Client/runclient.cmd
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/Client/runclient.cmd
diff --git a/branches/cpp-M1/sca/samples/Calculator/Client/runclient.sh b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/Client/runclient.sh
index 4dfea2f4a8..4dfea2f4a8 100755
--- a/branches/cpp-M1/sca/samples/Calculator/Client/runclient.sh
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/Client/runclient.sh
diff --git a/branches/cpp-M1/sca/samples/Calculator/Makefile.am b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/Makefile.am
index cbeaeb0f96..cbeaeb0f96 100644
--- a/branches/cpp-M1/sca/samples/Calculator/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/Makefile.am
diff --git a/branches/cpp-M1/sca/samples/Calculator/WSClient/Calculator_Client.cpp b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/WSClient/Calculator_Client.cpp
index 5d6cd9e1bb..5d6cd9e1bb 100644
--- a/branches/cpp-M1/sca/samples/Calculator/WSClient/Calculator_Client.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/WSClient/Calculator_Client.cpp
diff --git a/branches/cpp-M1/sca/samples/Calculator/WSClient/Makefile.am b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/WSClient/Makefile.am
index 706c0927b5..706c0927b5 100644
--- a/branches/cpp-M1/sca/samples/Calculator/WSClient/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/WSClient/Makefile.am
diff --git a/branches/cpp-M1/sca/samples/Calculator/WSClient/axis2_Calculator_stub.cpp b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/WSClient/axis2_Calculator_stub.cpp
index 8455c0d209..8455c0d209 100644
--- a/branches/cpp-M1/sca/samples/Calculator/WSClient/axis2_Calculator_stub.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/WSClient/axis2_Calculator_stub.cpp
diff --git a/branches/cpp-M1/sca/samples/Calculator/WSClient/axis2_Calculator_stub.h b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/WSClient/axis2_Calculator_stub.h
index 54cce17562..54cce17562 100644
--- a/branches/cpp-M1/sca/samples/Calculator/WSClient/axis2_Calculator_stub.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/WSClient/axis2_Calculator_stub.h
diff --git a/branches/cpp-M1/sca/samples/Calculator/WSClient/runwsclient.cmd b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/WSClient/runwsclient.cmd
index ba387a4bab..ba387a4bab 100644
--- a/branches/cpp-M1/sca/samples/Calculator/WSClient/runwsclient.cmd
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/WSClient/runwsclient.cmd
diff --git a/branches/cpp-M1/sca/samples/Calculator/WSClient/runwsclient.sh b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/WSClient/runwsclient.sh
index 2e8e79fc9c..2e8e79fc9c 100755
--- a/branches/cpp-M1/sca/samples/Calculator/WSClient/runwsclient.sh
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Calculator/WSClient/runwsclient.sh
diff --git a/branches/cpp-M1/sca/samples/ChangeLog b/sca-cpp/branches/cpp-M1/sca/samples/ChangeLog
index e69de29bb2..e69de29bb2 100644
--- a/branches/cpp-M1/sca/samples/ChangeLog
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ChangeLog
diff --git a/branches/cpp-M1/sca/samples/GettingStarted.html b/sca-cpp/branches/cpp-M1/sca/samples/GettingStarted.html
index 604de50ff9..604de50ff9 100644
--- a/branches/cpp-M1/sca/samples/GettingStarted.html
+++ b/sca-cpp/branches/cpp-M1/sca/samples/GettingStarted.html
diff --git a/branches/cpp-M1/sca/samples/INSTALL b/sca-cpp/branches/cpp-M1/sca/samples/INSTALL
index 2a6a072bf5..2a6a072bf5 100644
--- a/branches/cpp-M1/sca/samples/INSTALL
+++ b/sca-cpp/branches/cpp-M1/sca/samples/INSTALL
diff --git a/branches/cpp-M1/sca/samples/LICENSE b/sca-cpp/branches/cpp-M1/sca/samples/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/branches/cpp-M1/sca/samples/LICENSE
+++ b/sca-cpp/branches/cpp-M1/sca/samples/LICENSE
diff --git a/branches/cpp-M1/sca/samples/Makefile.am b/sca-cpp/branches/cpp-M1/sca/samples/Makefile.am
index 2531254930..2531254930 100644
--- a/branches/cpp-M1/sca/samples/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/samples/Makefile.am
diff --git a/branches/cpp-M1/sca/samples/MyValue/Client/Makefile.am b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/Client/Makefile.am
index b1586cc752..b1586cc752 100644
--- a/branches/cpp-M1/sca/samples/MyValue/Client/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/Client/Makefile.am
diff --git a/branches/cpp-M1/sca/samples/MyValue/Client/MyValueClient.cpp b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/Client/MyValueClient.cpp
index 1e5c038e2e..1e5c038e2e 100755
--- a/branches/cpp-M1/sca/samples/MyValue/Client/MyValueClient.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/Client/MyValueClient.cpp
diff --git a/branches/cpp-M1/sca/samples/MyValue/Makefile.am b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/Makefile.am
index 7541093280..7541093280 100644
--- a/branches/cpp-M1/sca/samples/MyValue/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/Makefile.am
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo.fragment b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo.fragment
index b7f79799b5..b7f79799b5 100755
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo.fragment
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo.fragment
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/CustomerInfo.h b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/CustomerInfo.h
index 766fc55fe6..766fc55fe6 100755
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/CustomerInfo.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/CustomerInfo.h
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/CustomerInfoImpl.componentType b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/CustomerInfoImpl.componentType
index 52988cb90a..52988cb90a 100755
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/CustomerInfoImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/CustomerInfoImpl.componentType
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/CustomerInfoImpl.cpp b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/CustomerInfoImpl.cpp
index ed3ff5e2ff..ed3ff5e2ff 100755
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/CustomerInfoImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/CustomerInfoImpl.cpp
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/CustomerInfoImpl.h b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/CustomerInfoImpl.h
index c943b1d666..c943b1d666 100755
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/CustomerInfoImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/CustomerInfoImpl.h
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/Makefile.am b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/Makefile.am
index 78161c429c..78161c429c 100644
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/CustomerInfo/Makefile.am
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/Makefile.am b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/Makefile.am
index 7d57c06f3d..7d57c06f3d 100644
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/Makefile.am
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/Makefile.am b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/Makefile.am
index 85e1077998..85e1077998 100644
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/Makefile.am
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValue.h b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValue.h
index 3efa7ecc61..3efa7ecc61 100755
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValue.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValue.h
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueImpl.componentType b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueImpl.componentType
index 16530400b5..16530400b5 100755
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueImpl.componentType
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueImpl.cpp b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueImpl.cpp
index 4a2d64ea6d..4a2d64ea6d 100755
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueImpl.cpp
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueImpl.h b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueImpl.h
index 05aa7066c1..05aa7066c1 100755
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueImpl.h
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueService.wsdl b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueService.wsdl
index 3bc1a12d5c..3bc1a12d5c 100755
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueService.wsdl
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueService.wsdl
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueService.xsd b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueService.xsd
index bf41ea511a..bf41ea511a 100755
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueService.xsd
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/MyValue/MyValueService.xsd
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/StockQuoteService/StockQuoteService.h b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/StockQuoteService/StockQuoteService.h
index 7da4069bd1..7da4069bd1 100755
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/StockQuoteService/StockQuoteService.h
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/StockQuoteService/StockQuoteService.h
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/StockQuoteService/StockQuoteService.wsdl b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/StockQuoteService/StockQuoteService.wsdl
index 4917cde583..4917cde583 100755
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/StockQuoteService/StockQuoteService.wsdl
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/StockQuoteService/StockQuoteService.wsdl
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/Tuscany-model.config b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/Tuscany-model.config
index 2667f62990..2667f62990 100755
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/Tuscany-model.config
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/Tuscany-model.config
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/sca.module b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/sca.module
index bda42e04bc..bda42e04bc 100755
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueModule/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueModule/sca.module
diff --git a/branches/cpp-M1/sca/samples/MyValue/MyValueSubsystem/sca.subsystem b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueSubsystem/sca.subsystem
index ae858ea331..ae858ea331 100755
--- a/branches/cpp-M1/sca/samples/MyValue/MyValueSubsystem/sca.subsystem
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/MyValueSubsystem/sca.subsystem
diff --git a/branches/cpp-M1/sca/samples/MyValue/runMyValueClient.sh b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/runMyValueClient.sh
index e5feeda1f0..e5feeda1f0 100755
--- a/branches/cpp-M1/sca/samples/MyValue/runMyValueClient.sh
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/runMyValueClient.sh
diff --git a/branches/cpp-M1/sca/samples/MyValue/server.wsdd b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/server.wsdd
index 8b80b4b6ec..8b80b4b6ec 100755
--- a/branches/cpp-M1/sca/samples/MyValue/server.wsdd
+++ b/sca-cpp/branches/cpp-M1/sca/samples/MyValue/server.wsdd
diff --git a/branches/cpp-M1/sca/samples/NEWS b/sca-cpp/branches/cpp-M1/sca/samples/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/branches/cpp-M1/sca/samples/NEWS
+++ b/sca-cpp/branches/cpp-M1/sca/samples/NEWS
diff --git a/branches/cpp-M1/sca/samples/NOTICE b/sca-cpp/branches/cpp-M1/sca/samples/NOTICE
index bfb81409ad..bfb81409ad 100644
--- a/branches/cpp-M1/sca/samples/NOTICE
+++ b/sca-cpp/branches/cpp-M1/sca/samples/NOTICE
diff --git a/branches/cpp-M1/sca/samples/README b/sca-cpp/branches/cpp-M1/sca/samples/README
index e69de29bb2..e69de29bb2 100644
--- a/branches/cpp-M1/sca/samples/README
+++ b/sca-cpp/branches/cpp-M1/sca/samples/README
diff --git a/branches/cpp-M1/sca/samples/autogen.sh b/sca-cpp/branches/cpp-M1/sca/samples/autogen.sh
index 3cebb0a380..3cebb0a380 100755
--- a/branches/cpp-M1/sca/samples/autogen.sh
+++ b/sca-cpp/branches/cpp-M1/sca/samples/autogen.sh
diff --git a/branches/cpp-M1/sca/samples/build.sh b/sca-cpp/branches/cpp-M1/sca/samples/build.sh
index 72e1466c1f..72e1466c1f 100755
--- a/branches/cpp-M1/sca/samples/build.sh
+++ b/sca-cpp/branches/cpp-M1/sca/samples/build.sh
diff --git a/branches/cpp-M1/sca/samples/configure.ac b/sca-cpp/branches/cpp-M1/sca/samples/configure.ac
index e4c9932dbb..e4c9932dbb 100644
--- a/branches/cpp-M1/sca/samples/configure.ac
+++ b/sca-cpp/branches/cpp-M1/sca/samples/configure.ac
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator.dsw b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator.dsw
index 5dbc8fdd57..5dbc8fdd57 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator.dsw
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator.dsw
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator.ncb b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator.ncb
index c9c6664018..c9c6664018 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator.ncb
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator.ncb
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator.opt b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator.opt
index 9de734b76e..9de734b76e 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator.opt
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator.opt
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp
index 19c7866d5f..19c7866d5f 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.mak b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.mak
index 17fdd321de..17fdd321de 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.mak
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.mak
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.dsp b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.dsp
index 0964957127..0964957127 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.dsp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.dsp
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.mak b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.mak
index bf8f403e25..bf8f403e25 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.mak
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.mak
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/WSClient/BuildInstructions.txt b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/WSClient/BuildInstructions.txt
index ff50bdbedc..ff50bdbedc 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/WSClient/BuildInstructions.txt
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/WSClient/BuildInstructions.txt
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.dsp b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.dsp
index 5b3739598a..5b3739598a 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.dsp
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.dsp
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.mak b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.mak
index 4ce51c68bb..4ce51c68bb 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.mak
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.mak
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/build.cmd b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/build.cmd
index 4590d670f0..4590d670f0 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/build.cmd
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/build.cmd
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd
index 864dca4652..864dca4652 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd
index 8d39a4c10d..8d39a4c10d 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/Calculator.sln b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/Calculator.sln
index 07c78db063..07c78db063 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/Calculator.sln
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/Calculator.sln
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/Calculator.suo b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/Calculator.suo
index cee3b2f73d..cee3b2f73d 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/Calculator.suo
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/Calculator.suo
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/Calculator/Calculator.vcproj b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/Calculator/Calculator.vcproj
index 5a081e088b..5a081e088b 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/Calculator/Calculator.vcproj
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/Calculator/Calculator.vcproj
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/Client/Client.vcproj b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/Client/Client.vcproj
index 0988c9a18c..0988c9a18c 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/Client/Client.vcproj
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/Client/Client.vcproj
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/WSClient/BuildInstructions.txt b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/WSClient/BuildInstructions.txt
index 3716551f14..3716551f14 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/WSClient/BuildInstructions.txt
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/WSClient/BuildInstructions.txt
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/WSClient/WSClient.vcproj b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/WSClient/WSClient.vcproj
index f76277238b..f76277238b 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/WSClient/WSClient.vcproj
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/WSClient/WSClient.vcproj
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/deploy.cmd b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/deploy.cmd
index b7b7ba1c05..b7b7ba1c05 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/deploy.cmd
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/deploy.cmd
diff --git a/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/wsdeploy.cmd b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/wsdeploy.cmd
index 68a5090820..68a5090820 100644
--- a/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/wsdeploy.cmd
+++ b/sca-cpp/branches/cpp-M1/sca/samples/ides/devstudio7/projects/Calculator/wsdeploy.cmd
diff --git a/branches/cpp-M1/sca/scatest.bat b/sca-cpp/branches/cpp-M1/sca/scatest.bat
index 42e56a6189..42e56a6189 100644
--- a/branches/cpp-M1/sca/scatest.bat
+++ b/sca-cpp/branches/cpp-M1/sca/scatest.bat
diff --git a/branches/cpp-M1/sca/scatest.sh b/sca-cpp/branches/cpp-M1/sca/scatest.sh
index e2924678a9..e2924678a9 100755
--- a/branches/cpp-M1/sca/scatest.sh
+++ b/sca-cpp/branches/cpp-M1/sca/scatest.sh
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestClient/WSEntryPointTestClient.c b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestClient/WSEntryPointTestClient.c
index 66e90c2fc2..66e90c2fc2 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestClient/WSEntryPointTestClient.c
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestClient/WSEntryPointTestClient.c
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestClient/WSEntryPointTestClient.vcproj b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestClient/WSEntryPointTestClient.vcproj
index e540e44c49..e540e44c49 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestClient/WSEntryPointTestClient.vcproj
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestClient/WSEntryPointTestClient.vcproj
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/Tuscany-model.config b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/Tuscany-model.config
index 982f7bc271..982f7bc271 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/Tuscany-model.config
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/Tuscany-model.config
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTest.h b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTest.h
index 19f7aa0b75..19f7aa0b75 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTest.h
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTest.h
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTest.wsdl b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTest.wsdl
index b6328f46f6..b6328f46f6 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTest.wsdl
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTest.wsdl
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl.componentType b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl.componentType
index cd58a345e6..cd58a345e6 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl.componentType
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl.cpp b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl.cpp
index 462ee1ac4d..462ee1ac4d 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl.cpp
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl.h b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl.h
index 926b6073d4..926b6073d4 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl.h
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl_WSEntryPointTestService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl_WSEntryPointTestService_Proxy.cpp
index 8f564ff5bc..8f564ff5bc 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl_WSEntryPointTestService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl_WSEntryPointTestService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl_WSEntryPointTestService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl_WSEntryPointTestService_Proxy.h
index 9dca8a61bc..9dca8a61bc 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl_WSEntryPointTestService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl_WSEntryPointTestService_Proxy.h
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl_WSEntryPointTestService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl_WSEntryPointTestService_Wrapper.cpp
index 7a879a310b..7a879a310b 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl_WSEntryPointTestService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl_WSEntryPointTestService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl_WSEntryPointTestService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl_WSEntryPointTestService_Wrapper.h
index 7bcd09b7c8..7bcd09b7c8 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl_WSEntryPointTestService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestImpl_WSEntryPointTestService_Wrapper.h
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestModule.vcproj b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestModule.vcproj
index 6ff73c3f1c..6ff73c3f1c 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestModule.vcproj
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/WSEntryPointTestModule.vcproj
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/sca.module b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/sca.module
index f92fae8110..f92fae8110 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/sca.module
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/services.xml b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/services.xml
index b863c79409..b863c79409 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/services.xml
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestModule/services.xml
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestSubsystem/sca.subsystem b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestSubsystem/sca.subsystem
index 45ae34fd42..45ae34fd42 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestSubsystem/sca.subsystem
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/WSEntryPointTestSubsystem/sca.subsystem
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/Tuscany-model.config b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/Tuscany-model.config
index 982f7bc271..982f7bc271 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/Tuscany-model.config
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/Tuscany-model.config
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/WSEntryPointTest.h b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/WSEntryPointTest.h
index 19f7aa0b75..19f7aa0b75 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/WSEntryPointTest.h
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/WSEntryPointTest.h
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/WSEntryPointTest.wsdl b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/WSEntryPointTest.wsdl
index 294ae076a7..294ae076a7 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/WSEntryPointTest.wsdl
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/WSEntryPointTest.wsdl
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/WSEntryPointTestImpl.componentType b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/WSEntryPointTestImpl.componentType
index cd58a345e6..cd58a345e6 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/WSEntryPointTestImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/WSEntryPointTestImpl.componentType
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/WSEntryPointTestImpl.h b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/WSEntryPointTestImpl.h
index 926b6073d4..926b6073d4 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/WSEntryPointTestImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/WSEntryPointTestImpl.h
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/sca.module b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/sca.module
index f92fae8110..f92fae8110 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/modules/WSEntryPointTestModule/sca.module
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/subsystems/WSEntryPointTestSubsystem/sca.subsystem b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/subsystems/WSEntryPointTestSubsystem/sca.subsystem
index 45ae34fd42..45ae34fd42 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/subsystems/WSEntryPointTestSubsystem/sca.subsystem
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTest/runtime/subsystems/WSEntryPointTestSubsystem/sca.subsystem
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c
index c23e845691..c23e845691 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.c
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.vcproj b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.vcproj
index 5c48a3a683..5c48a3a683 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.vcproj
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCClient/WSEntryPointTestRPCClient.vcproj
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/Tuscany-model.config b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/Tuscany-model.config
index 42ad3ccfe3..42ad3ccfe3 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/Tuscany-model.config
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/Tuscany-model.config
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPC.h b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPC.h
index 5bd20f103a..5bd20f103a 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPC.h
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPC.h
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPC.wsdl b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPC.wsdl
index 1706534042..1706534042 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPC.wsdl
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPC.wsdl
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.componentType b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.componentType
index 15287150e0..15287150e0 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.componentType
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.cpp b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.cpp
index f46d64db18..f46d64db18 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.cpp
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.h b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.h
index 82023992c7..82023992c7 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.h
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.cpp
index b3799db850..b3799db850 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.h
index 36aa7a6992..36aa7a6992 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Proxy.h
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.cpp
index c20a5fb027..c20a5fb027 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.h
index 875143461a..875143461a 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl_WSEntryPointTestRPCService_Wrapper.h
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCModule.vcproj b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCModule.vcproj
index d3bc172bcd..d3bc172bcd 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCModule.vcproj
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/WSEntryPointTestRPCModule.vcproj
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/sca.module b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/sca.module
index a6d397653e..a6d397653e 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/sca.module
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/services.xml b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/services.xml
index 2fd4580526..2fd4580526 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/services.xml
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCModule/services.xml
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCSubsystem/sca.subsystem b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCSubsystem/sca.subsystem
index c37d656a57..c37d656a57 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCSubsystem/sca.subsystem
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/WSEntryPointTestRPCSubsystem/sca.subsystem
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/Tuscany-model.config b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/Tuscany-model.config
index 42ad3ccfe3..42ad3ccfe3 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/Tuscany-model.config
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/Tuscany-model.config
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/WSEntryPointTestRPC.h b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/WSEntryPointTestRPC.h
index 5bd20f103a..5bd20f103a 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/WSEntryPointTestRPC.h
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/WSEntryPointTestRPC.h
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/WSEntryPointTestRPC.wsdl b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/WSEntryPointTestRPC.wsdl
index 1706534042..1706534042 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/WSEntryPointTestRPC.wsdl
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/WSEntryPointTestRPC.wsdl
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.componentType b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.componentType
index 15287150e0..15287150e0 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.componentType
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.h b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.h
index 82023992c7..82023992c7 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/WSEntryPointTestRPCImpl.h
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/sca.module b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/sca.module
index a6d397653e..a6d397653e 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/modules/WSEntryPointTestRPCModule/sca.module
diff --git a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/subsystems/WSEntryPointTestRPCSubsystem/sca.subsystem b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/subsystems/WSEntryPointTestRPCSubsystem/sca.subsystem
index c37d656a57..c37d656a57 100644
--- a/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/subsystems/WSEntryPointTestRPCSubsystem/sca.subsystem
+++ b/sca-cpp/branches/cpp-M1/sca/test/WSEntryPointTestRPC/runtime/subsystems/WSEntryPointTestRPCSubsystem/sca.subsystem
diff --git a/branches/cpp-M1/sca/tools/Makefile.am b/sca-cpp/branches/cpp-M1/sca/tools/Makefile.am
index 0bea197e35..0bea197e35 100644
--- a/branches/cpp-M1/sca/tools/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/tools/Makefile.am
diff --git a/branches/cpp-M1/sca/tools/scagen/META-INF/LICENSE b/sca-cpp/branches/cpp-M1/sca/tools/scagen/META-INF/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/branches/cpp-M1/sca/tools/scagen/META-INF/LICENSE
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/META-INF/LICENSE
diff --git a/branches/cpp-M1/sca/tools/scagen/META-INF/NOTICE b/sca-cpp/branches/cpp-M1/sca/tools/scagen/META-INF/NOTICE
index bfb81409ad..bfb81409ad 100644
--- a/branches/cpp-M1/sca/tools/scagen/META-INF/NOTICE
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/META-INF/NOTICE
diff --git a/branches/cpp-M1/sca/tools/scagen/META-INF/README b/sca-cpp/branches/cpp-M1/sca/tools/scagen/META-INF/README
index 2831dadd94..2831dadd94 100644
--- a/branches/cpp-M1/sca/tools/scagen/META-INF/README
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/META-INF/README
diff --git a/branches/cpp-M1/sca/tools/scagen/Makefile.am b/sca-cpp/branches/cpp-M1/sca/tools/scagen/Makefile.am
index 0d8e880488..0d8e880488 100644
--- a/branches/cpp-M1/sca/tools/scagen/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/Makefile.am
diff --git a/branches/cpp-M1/sca/tools/scagen/build.xml b/sca-cpp/branches/cpp-M1/sca/tools/scagen/build.xml
index 1b8e66e50a..1b8e66e50a 100644
--- a/branches/cpp-M1/sca/tools/scagen/build.xml
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/build.xml
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java
index 448fd6dd7d..448fd6dd7d 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
index 82bdce4dd4..82bdce4dd4 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java
index 35b3416057..35b3416057 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceButNotInClassAttrTest.java
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
index 5c38f6fe31..5c38f6fe31 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
index b4b025bcba..b4b025bcba 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
index 90ea9751ad..90ea9751ad 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingModuleAndFragmentTest.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingModuleAndFragmentTest.java
index d45e9eb941..d45e9eb941 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingModuleAndFragmentTest.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingModuleAndFragmentTest.java
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
index baf5ad6c61..baf5ad6c61 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllModulesTest.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllModulesTest.java
index d0d85db1ea..d0d85db1ea 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllModulesTest.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllModulesTest.java
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
index 8210ca9a5c..8210ca9a5c 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
index 7eae483fb4..7eae483fb4 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/go.cmd b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/go.cmd
index 6a303b1471..6a303b1471 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/go.cmd
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/go.cmd
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_dir_option.cmd b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_dir_option.cmd
index 13834b3aae..13834b3aae 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_dir_option.cmd
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_dir_option.cmd
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_input_dir.cmd b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_input_dir.cmd
index 4fa9a86b1f..4fa9a86b1f 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_input_dir.cmd
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_input_dir.cmd
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_output_dir.cmd b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_output_dir.cmd
index 5e6b818ae3..5e6b818ae3 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_output_dir.cmd
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/go_no_output_dir.cmd
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/refresh-tools-jar.cmd b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/refresh-tools-jar.cmd
index 2640ed87de..2640ed87de 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/refresh-tools-jar.cmd
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/scripts_for_standalone_testing/refresh-tools-jar.cmd
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/Calculator.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/Calculator.h
index 3ab503ef1d..3ab503ef1d 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/Calculator.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/Calculator.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/CalculatorImpl.componentType b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/CalculatorImpl.componentType
index ef0f346ba0..ef0f346ba0 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/CalculatorImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/CalculatorImpl.componentType
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/CalculatorImpl.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/CalculatorImpl.h
index daa9b25627..daa9b25627 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/CalculatorImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/CalculatorImpl.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/sca.module b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/sca.module
index f74d5f690c..f74d5f690c 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/sca.module
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h
index da74be77a6..da74be77a6 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h
index 48a5ff5018..48a5ff5018 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/sca.module b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/sca.module
index b4aaa37a4c..b4aaa37a4c 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/sca.module
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType
index 6a5a152266..6a5a152266 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h
index 0cacc5916c..0cacc5916c 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType
index 9617b22aee..9617b22aee 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h
index f3b0467002..f3b0467002 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment
index 29fd03c399..29fd03c399 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h
index d5e1a702c6..d5e1a702c6 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType
index d39a3bdadf..d39a3bdadf 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h
index 546df093a3..546df093a3 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment
index fa6d101363..fa6d101363 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h
index d3be176bfd..d3be176bfd 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType
index d39a3bdadf..d39a3bdadf 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h
index 50d37ee4f2..50d37ee4f2 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfo.fragment b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfo.fragment
index 491e79f5e4..491e79f5e4 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfo.fragment
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfo.fragment
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfo.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfo.h
index 7bd355b3ab..7bd355b3ab 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfo.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfo.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfoImpl.componentType b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfoImpl.componentType
index 179af71dca..179af71dca 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfoImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfoImpl.componentType
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfoImpl.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfoImpl.h
index 85e96bb348..85e96bb348 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfoImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfoImpl.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValue.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValue.h
index a65b1f944c..a65b1f944c 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValue.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValue.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl.componentType b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl.componentType
index df0d97a438..df0d97a438 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl.componentType
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl.hpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl.hpp
index f7a8171a65..f7a8171a65 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl.hpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl.hpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl_stockQuote_Proxy.h
index 5c8293b51e..5c8293b51e 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl_stockQuote_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/StockQuoteService.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/StockQuoteService.h
index d96115fb3f..d96115fb3f 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/StockQuoteService.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/StockQuoteService.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/sca.module b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/sca.module
index 565f4a74ec..565f4a74ec 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModule/sca.module
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfo.fragment b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfo.fragment
index 5666c51a41..5666c51a41 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfo.fragment
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfo.fragment
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfo.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfo.h
index e41f9e8287..e41f9e8287 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfo.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfo.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfoImpl.componentType b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfoImpl.componentType
index 179af71dca..179af71dca 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfoImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfoImpl.componentType
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfoImpl.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfoImpl.h
index b1360c5994..b1360c5994 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfoImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfoImpl.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValue.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValue.h
index 8b921bc2bf..8b921bc2bf 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValue.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValue.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl.componentType b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl.componentType
index df0d97a438..df0d97a438 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl.componentType
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl.hpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl.hpp
index f7a8171a65..f7a8171a65 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl.hpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl.hpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h
index 5c8293b51e..5c8293b51e 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/StockQuoteService.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/StockQuoteService.h
index 919b514e1a..919b514e1a 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/StockQuoteService.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/StockQuoteService.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/sca.module b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/sca.module
index 565f4a74ec..565f4a74ec 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/sca.module
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValue.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValue.h
index 73af9ae562..73af9ae562 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValue.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValue.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
index ff4ff50e9b..ff4ff50e9b 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
index 77950477ce..77950477ce 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/sca.module b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/sca.module
index ab49065c21..ab49065c21 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/sca.module
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValue.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValue.h
index 503f771bb2..503f771bb2 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValue.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValue.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValueImpl.componentType b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValueImpl.componentType
index 8673c813a6..8673c813a6 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValueImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValueImpl.componentType
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValueImpl.hpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValueImpl.hpp
index f7a8171a65..f7a8171a65 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValueImpl.hpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValueImpl.hpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/sca.module b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/sca.module
index 6572621f1d..6572621f1d 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/sca.module
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValue.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValue.h
index ea8ebbb792..ea8ebbb792 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValue.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValue.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
index c8d68fba5a..c8d68fba5a 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
index f7a8171a65..f7a8171a65 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/sca.module b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/sca.module
index 6572621f1d..6572621f1d 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/sca.module
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleMissingScaModule/CustomerInfo.fragmentX b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleMissingScaModule/CustomerInfo.fragmentX
index 10c1805244..10c1805244 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleMissingScaModule/CustomerInfo.fragmentX
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleMissingScaModule/CustomerInfo.fragmentX
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleMissingScaModule/sca.moduleX b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleMissingScaModule/sca.moduleX
index 3eea80439f..3eea80439f 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleMissingScaModule/sca.moduleX
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleMissingScaModule/sca.moduleX
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfo.fragment b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfo.fragment
index 491e79f5e4..491e79f5e4 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfo.fragment
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfo.fragment
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfo.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfo.h
index 7bd355b3ab..7bd355b3ab 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfo.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfo.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfoImpl.componentType b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfoImpl.componentType
index 179af71dca..179af71dca 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfoImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfoImpl.componentType
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfoImpl.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfoImpl.h
index e247a9b0bb..e247a9b0bb 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfoImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfoImpl.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValue.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValue.h
index a65b1f944c..a65b1f944c 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValue.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValue.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl.componentType b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl.componentType
index df0d97a438..df0d97a438 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl.componentType
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl.hpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl.hpp
index f7a8171a65..f7a8171a65 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl.hpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl.hpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl_stockQuote_Proxy.h
index 5c8293b51e..5c8293b51e 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl_stockQuote_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/StockQuoteService.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/StockQuoteService.h
index 919b514e1a..919b514e1a 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/StockQuoteService.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/StockQuoteService.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/sca.module b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/sca.module
index 565f4a74ec..565f4a74ec 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/sca.module
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/sca.module
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfo.fragment b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfo.fragment
index 687162ec2a..687162ec2a 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfo.fragment
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfo.fragment
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfo.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfo.h
index b944d161eb..b944d161eb 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfo.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfo.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType
index 179af71dca..179af71dca 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h
index 87cac61085..87cac61085 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
index 3b04e26b05..3b04e26b05 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
index ad8f588ede..ad8f588ede 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
index 787314f817..787314f817 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
index c881576ca2..c881576ca2 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
index aeb9642130..aeb9642130 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
index 4a263154e0..4a263154e0 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
index 6f71734763..6f71734763 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
index 1dbfdd58c1..1dbfdd58c1 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
index 33b66fbc28..33b66fbc28 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
index 9b87ee9d7e..9b87ee9d7e 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
index ce20b11941..ce20b11941 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
index bb035ccb2b..bb035ccb2b 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index 9f09ba8d6f..9f09ba8d6f 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index baa55ac5b8..baa55ac5b8 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index 25d73c326c..25d73c326c 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 5fb82c4295..5fb82c4295 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index 531ca6c010..531ca6c010 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index f35d841b12..f35d841b12 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index 892b92c524..892b92c524 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 5fb82c4295..5fb82c4295 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
index b875e97a95..b875e97a95 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
index 90cf63c66a..90cf63c66a 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
index 03c4b2af44..03c4b2af44 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
index 2a73893241..2a73893241 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index d34b63ea14..d34b63ea14 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.h
index 742947ca69..742947ca69 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index da60e4c1e3..da60e4c1e3 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.h
index f8b8b11724..f8b8b11724 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.cpp
index cda55a99c8..cda55a99c8 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.h
index 6ac33b4ef6..6ac33b4ef6 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.cpp
index 3656acbaad..3656acbaad 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.h
index 7619b6c9cd..7619b6c9cd 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index e6cb3b3426..e6cb3b3426 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index 1e2c47225e..1e2c47225e 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index 57404925d2..57404925d2 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index cbb77ab41e..cbb77ab41e 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index d34b63ea14..d34b63ea14 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
index 742947ca69..742947ca69 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index d5eaade5b1..d5eaade5b1 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
index bcaff5b880..bcaff5b880 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
index cda55a99c8..cda55a99c8 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
index 6ac33b4ef6..6ac33b4ef6 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
index 3656acbaad..3656acbaad 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
index 7619b6c9cd..7619b6c9cd 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index b1f76af778..b1f76af778 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
index d9459ece24..d9459ece24 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index d77b4a302d..d77b4a302d 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
index 3992f0445f..3992f0445f 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index 4cdd4899b0..4cdd4899b0 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
index 5bb75abd5b..5bb75abd5b 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index 34125fa6a3..34125fa6a3 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
index f8b8b11724..f8b8b11724 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index 4cdd4899b0..4cdd4899b0 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
index 5bb75abd5b..5bb75abd5b 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index 34125fa6a3..34125fa6a3 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
index f8b8b11724..f8b8b11724 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
index b875e97a95..b875e97a95 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
index 90cf63c66a..90cf63c66a 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
index 12d3a1a3d1..12d3a1a3d1 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
index 2a73893241..2a73893241 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index d34b63ea14..d34b63ea14 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
index 742947ca69..742947ca69 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index 83857169e5..83857169e5 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
index f8b8b11724..f8b8b11724 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
index cda55a99c8..cda55a99c8 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
index 6ac33b4ef6..6ac33b4ef6 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
index 3656acbaad..3656acbaad 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
index 7619b6c9cd..7619b6c9cd 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index 074406c606..074406c606 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index ddb678c094..ddb678c094 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index 09000f9040..09000f9040 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 5fb82c4295..5fb82c4295 100644
--- a/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/branches/cpp-M1/sca/tools/scagen/lib/readme.txt b/sca-cpp/branches/cpp-M1/sca/tools/scagen/lib/readme.txt
index d99c666c6a..d99c666c6a 100644
--- a/branches/cpp-M1/sca/tools/scagen/lib/readme.txt
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/lib/readme.txt
diff --git a/branches/cpp-M1/sca/tools/scagen/scagen.cmd b/sca-cpp/branches/cpp-M1/sca/tools/scagen/scagen.cmd
index a655d5d217..a655d5d217 100644
--- a/branches/cpp-M1/sca/tools/scagen/scagen.cmd
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/scagen.cmd
diff --git a/branches/cpp-M1/sca/tools/scagen/scagen.sh b/sca-cpp/branches/cpp-M1/sca/tools/scagen/scagen.sh
index 23d6dedc47..23d6dedc47 100755
--- a/branches/cpp-M1/sca/tools/scagen/scagen.sh
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/scagen.sh
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java
index 65b1e2f6fa..65b1e2f6fa 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java
index 6846bb4096..6846bb4096 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java
index 1a900ff711..1a900ff711 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java
index a4f1ca9a21..a4f1ca9a21 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java
index fc1c8ec5c3..fc1c8ec5c3 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java
index e629751ea4..e629751ea4 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java
index 8deba2401d..8deba2401d 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java
index 6fa68b14a3..6fa68b14a3 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java
index 813de0ff56..813de0ff56 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java
index facebe84ef..facebe84ef 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java
index dc9d941849..dc9d941849 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java
index 3f4b3e971e..3f4b3e971e 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java
index 3f140c0f9f..3f140c0f9f 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java
index 64ed2e9542..64ed2e9542 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java
index 3650839cab..3650839cab 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java
index 5bd80fc37a..5bd80fc37a 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html
index c86184f441..c86184f441 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
index 60bc8395e1..60bc8395e1 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java
index 0ee9b97138..0ee9b97138 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java
index 1ff4504fff..1ff4504fff 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java
index 2ca4c7c881..2ca4c7c881 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java
index 00942bd9ca..00942bd9ca 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java
index 3f9fb359f5..3f9fb359f5 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java
index 699abf7a08..699abf7a08 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ModuleOrFragmentFileHandler.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ModuleOrFragmentFileHandler.java
index 3bd8129401..3bd8129401 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ModuleOrFragmentFileHandler.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ModuleOrFragmentFileHandler.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
index a490d184d1..a490d184d1 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java
index a6f6f58644..a6f6f58644 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
index 79b74c0450..79b74c0450 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
index 465762050b..465762050b 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java
index 047e1ab3f1..047e1ab3f1 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html
index 316e4cd56e..316e4cd56e 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl
index d6e564599a..d6e564599a 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl
index 8c19b20727..8c19b20727 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
index 303ce9921d..303ce9921d 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
diff --git a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl
index f2afc37a07..f2afc37a07 100644
--- a/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl
+++ b/sca-cpp/branches/cpp-M1/sca/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl
diff --git a/branches/cpp-M1/sca/xsd/readme.txt b/sca-cpp/branches/cpp-M1/sca/xsd/readme.txt
index 7252f56a11..7252f56a11 100644
--- a/branches/cpp-M1/sca/xsd/readme.txt
+++ b/sca-cpp/branches/cpp-M1/sca/xsd/readme.txt
diff --git a/branches/cpp-M1/sca/xsd/sca-binding-sca.xsd b/sca-cpp/branches/cpp-M1/sca/xsd/sca-binding-sca.xsd
index 293c63e83a..293c63e83a 100644
--- a/branches/cpp-M1/sca/xsd/sca-binding-sca.xsd
+++ b/sca-cpp/branches/cpp-M1/sca/xsd/sca-binding-sca.xsd
diff --git a/branches/cpp-M1/sca/xsd/sca-binding-webservice.xsd b/sca-cpp/branches/cpp-M1/sca/xsd/sca-binding-webservice.xsd
index 95052a52aa..95052a52aa 100644
--- a/branches/cpp-M1/sca/xsd/sca-binding-webservice.xsd
+++ b/sca-cpp/branches/cpp-M1/sca/xsd/sca-binding-webservice.xsd
diff --git a/branches/cpp-M1/sca/xsd/sca-core.xsd b/sca-cpp/branches/cpp-M1/sca/xsd/sca-core.xsd
index 48fac92913..48fac92913 100644
--- a/branches/cpp-M1/sca/xsd/sca-core.xsd
+++ b/sca-cpp/branches/cpp-M1/sca/xsd/sca-core.xsd
diff --git a/branches/cpp-M1/sca/xsd/sca-implementation-cpp.xsd b/sca-cpp/branches/cpp-M1/sca/xsd/sca-implementation-cpp.xsd
index 970549176f..970549176f 100644
--- a/branches/cpp-M1/sca/xsd/sca-implementation-cpp.xsd
+++ b/sca-cpp/branches/cpp-M1/sca/xsd/sca-implementation-cpp.xsd
diff --git a/branches/cpp-M1/sca/xsd/sca-implementation-java.xsd b/sca-cpp/branches/cpp-M1/sca/xsd/sca-implementation-java.xsd
index 7745b4ffb7..7745b4ffb7 100644
--- a/branches/cpp-M1/sca/xsd/sca-implementation-java.xsd
+++ b/sca-cpp/branches/cpp-M1/sca/xsd/sca-implementation-java.xsd
diff --git a/branches/cpp-M1/sca/xsd/sca-interface-cpp.xsd b/sca-cpp/branches/cpp-M1/sca/xsd/sca-interface-cpp.xsd
index dd286afef6..dd286afef6 100644
--- a/branches/cpp-M1/sca/xsd/sca-interface-cpp.xsd
+++ b/sca-cpp/branches/cpp-M1/sca/xsd/sca-interface-cpp.xsd
diff --git a/branches/cpp-M1/sca/xsd/sca-interface-java.xsd b/sca-cpp/branches/cpp-M1/sca/xsd/sca-interface-java.xsd
index a1955a2795..a1955a2795 100644
--- a/branches/cpp-M1/sca/xsd/sca-interface-java.xsd
+++ b/sca-cpp/branches/cpp-M1/sca/xsd/sca-interface-java.xsd
diff --git a/branches/cpp-M1/sca/xsd/sca-interface-wsdl.xsd b/sca-cpp/branches/cpp-M1/sca/xsd/sca-interface-wsdl.xsd
index e857a77d84..e857a77d84 100644
--- a/branches/cpp-M1/sca/xsd/sca-interface-wsdl.xsd
+++ b/sca-cpp/branches/cpp-M1/sca/xsd/sca-interface-wsdl.xsd
diff --git a/branches/cpp-M1/sca/xsd/sca.xsd b/sca-cpp/branches/cpp-M1/sca/xsd/sca.xsd
index 619c38aaac..619c38aaac 100644
--- a/branches/cpp-M1/sca/xsd/sca.xsd
+++ b/sca-cpp/branches/cpp-M1/sca/xsd/sca.xsd
diff --git a/branches/cpp-M1/sca/xsd/tuscany.xsd b/sca-cpp/branches/cpp-M1/sca/xsd/tuscany.xsd
index 335db42475..335db42475 100644
--- a/branches/cpp-M1/sca/xsd/tuscany.xsd
+++ b/sca-cpp/branches/cpp-M1/sca/xsd/tuscany.xsd
diff --git a/branches/cpp-M1/sdo/AUTHORS b/sca-cpp/branches/cpp-M1/sdo/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/branches/cpp-M1/sdo/AUTHORS
+++ b/sca-cpp/branches/cpp-M1/sdo/AUTHORS
diff --git a/branches/cpp-M1/sdo/COPYING b/sca-cpp/branches/cpp-M1/sdo/COPYING
index 6b0b1270ff..6b0b1270ff 100755
--- a/branches/cpp-M1/sdo/COPYING
+++ b/sca-cpp/branches/cpp-M1/sdo/COPYING
diff --git a/branches/cpp-M1/sdo/ChangeLog b/sca-cpp/branches/cpp-M1/sdo/ChangeLog
index e69de29bb2..e69de29bb2 100644
--- a/branches/cpp-M1/sdo/ChangeLog
+++ b/sca-cpp/branches/cpp-M1/sdo/ChangeLog
diff --git a/branches/cpp-M1/sdo/Committers Guide.txt b/sca-cpp/branches/cpp-M1/sdo/Committers Guide.txt
index 5f82e39c14..5f82e39c14 100644
--- a/branches/cpp-M1/sdo/Committers Guide.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/Committers Guide.txt
diff --git a/branches/cpp-M1/sdo/GettingStarted.html b/sca-cpp/branches/cpp-M1/sdo/GettingStarted.html
index 00003b37fc..00003b37fc 100644
--- a/branches/cpp-M1/sdo/GettingStarted.html
+++ b/sca-cpp/branches/cpp-M1/sdo/GettingStarted.html
diff --git a/branches/cpp-M1/sdo/INSTALL b/sca-cpp/branches/cpp-M1/sdo/INSTALL
index 07946d51f4..07946d51f4 100644
--- a/branches/cpp-M1/sdo/INSTALL
+++ b/sca-cpp/branches/cpp-M1/sdo/INSTALL
diff --git a/branches/cpp-M1/sdo/LICENSE b/sca-cpp/branches/cpp-M1/sdo/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/branches/cpp-M1/sdo/LICENSE
+++ b/sca-cpp/branches/cpp-M1/sdo/LICENSE
diff --git a/branches/cpp-M1/sdo/Makefile.am b/sca-cpp/branches/cpp-M1/sdo/Makefile.am
index 56ffdec7e3..56ffdec7e3 100644
--- a/branches/cpp-M1/sdo/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sdo/Makefile.am
diff --git a/branches/cpp-M1/sdo/NEWS b/sca-cpp/branches/cpp-M1/sdo/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/branches/cpp-M1/sdo/NEWS
+++ b/sca-cpp/branches/cpp-M1/sdo/NEWS
diff --git a/branches/cpp-M1/sdo/NOTICE b/sca-cpp/branches/cpp-M1/sdo/NOTICE
index bfb81409ad..bfb81409ad 100644
--- a/branches/cpp-M1/sdo/NOTICE
+++ b/sca-cpp/branches/cpp-M1/sdo/NOTICE
diff --git a/branches/cpp-M1/sdo/README b/sca-cpp/branches/cpp-M1/sdo/README
index 99f88b1b4d..99f88b1b4d 100644
--- a/branches/cpp-M1/sdo/README
+++ b/sca-cpp/branches/cpp-M1/sdo/README
diff --git a/branches/cpp-M1/sdo/autogen.sh b/sca-cpp/branches/cpp-M1/sdo/autogen.sh
index 3cebb0a380..3cebb0a380 100755
--- a/branches/cpp-M1/sdo/autogen.sh
+++ b/sca-cpp/branches/cpp-M1/sdo/autogen.sh
diff --git a/branches/cpp-M1/sdo/build.bat b/sca-cpp/branches/cpp-M1/sdo/build.bat
index 2ec0d9a22a..2ec0d9a22a 100644
--- a/branches/cpp-M1/sdo/build.bat
+++ b/sca-cpp/branches/cpp-M1/sdo/build.bat
diff --git a/branches/cpp-M1/sdo/build.sh b/sca-cpp/branches/cpp-M1/sdo/build.sh
index 9bbb67c0b6..9bbb67c0b6 100755
--- a/branches/cpp-M1/sdo/build.sh
+++ b/sca-cpp/branches/cpp-M1/sdo/build.sh
diff --git a/branches/cpp-M1/sdo/configure.ac b/sca-cpp/branches/cpp-M1/sdo/configure.ac
index 66895eb079..66895eb079 100644
--- a/branches/cpp-M1/sdo/configure.ac
+++ b/sca-cpp/branches/cpp-M1/sdo/configure.ac
diff --git a/branches/cpp-M1/sdo/doc/css/maven-base.css b/sca-cpp/branches/cpp-M1/sdo/doc/css/maven-base.css
index 314da3a272..314da3a272 100644
--- a/branches/cpp-M1/sdo/doc/css/maven-base.css
+++ b/sca-cpp/branches/cpp-M1/sdo/doc/css/maven-base.css
diff --git a/branches/cpp-M1/sdo/doc/css/maven-theme.css b/sca-cpp/branches/cpp-M1/sdo/doc/css/maven-theme.css
index 5c8e7b4abf..5c8e7b4abf 100644
--- a/branches/cpp-M1/sdo/doc/css/maven-theme.css
+++ b/sca-cpp/branches/cpp-M1/sdo/doc/css/maven-theme.css
diff --git a/branches/cpp-M1/sdo/makebindist.sh b/sca-cpp/branches/cpp-M1/sdo/makebindist.sh
index ddb386787c..ddb386787c 100755
--- a/branches/cpp-M1/sdo/makebindist.sh
+++ b/sca-cpp/branches/cpp-M1/sdo/makebindist.sh
diff --git a/branches/cpp-M1/sdo/makedist.sh b/sca-cpp/branches/cpp-M1/sdo/makedist.sh
index 8f22565b17..8f22565b17 100755
--- a/branches/cpp-M1/sdo/makedist.sh
+++ b/sca-cpp/branches/cpp-M1/sdo/makedist.sh
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/build.cmd b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/build.cmd
index db38f34ce3..db38f34ce3 100644
--- a/branches/cpp-M1/sdo/projects/tuscany_sdo/build.cmd
+++ b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/build.cmd
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/build_instructions.txt b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/build_instructions.txt
index 2c1a98394c..2c1a98394c 100644
--- a/branches/cpp-M1/sdo/projects/tuscany_sdo/build_instructions.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/build_instructions.txt
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.dsp b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.dsp
index 23beda1539..23beda1539 100644
--- a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.dsp
+++ b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.dsp
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.mak b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.mak
index 64b4229ac5..64b4229ac5 100644
--- a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.mak
+++ b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.mak
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.dsp b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.dsp
index 2b75c42235..2b75c42235 100644
--- a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.dsp
+++ b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.dsp
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.mak b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.mak
index 6d01d2e09c..6d01d2e09c 100644
--- a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.mak
+++ b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.mak
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.dsp b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.dsp
index a72ac008e8..a72ac008e8 100644
--- a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.dsp
+++ b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.dsp
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.mak b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.mak
index 92d2e19dac..92d2e19dac 100644
--- a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.mak
+++ b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.mak
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/tuscany_sdo.ilk b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/tuscany_sdo.ilk
index f4fc233e2b..f4fc233e2b 100644
--- a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/tuscany_sdo.ilk
+++ b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/tuscany_sdo.ilk
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_test/sdo_test.dsp b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_test/sdo_test.dsp
index 68b514aa1b..68b514aa1b 100644
--- a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_test/sdo_test.dsp
+++ b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_test/sdo_test.dsp
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_test/sdo_test.mak b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_test/sdo_test.mak
index d4cc02d1f1..d4cc02d1f1 100644
--- a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_test/sdo_test.mak
+++ b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_test/sdo_test.mak
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.dsw b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.dsw
index 7447226eb9..7447226eb9 100644
--- a/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.dsw
+++ b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.dsw
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.ncb b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.ncb
index 6a595ae6aa..6a595ae6aa 100644
--- a/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.ncb
+++ b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.ncb
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.opt b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.opt
index 90fd624b1d..90fd624b1d 100644
--- a/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.opt
+++ b/sca-cpp/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.opt
diff --git a/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/build_instructions.txt b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/build_instructions.txt
index 8d2e518ef8..8d2e518ef8 100644
--- a/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/build_instructions.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/build_instructions.txt
diff --git a/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_axiom/sdo_axiom.vcproj b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_axiom/sdo_axiom.vcproj
index 6ac55e31fb..6ac55e31fb 100644
--- a/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_axiom/sdo_axiom.vcproj
+++ b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_axiom/sdo_axiom.vcproj
diff --git a/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.vcproj b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.vcproj
index 075e7347fb..075e7347fb 100644
--- a/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.vcproj
+++ b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.vcproj
diff --git a/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_runtime/sdo_runtime.vcproj b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_runtime/sdo_runtime.vcproj
index 259d340520..259d340520 100644
--- a/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_runtime/sdo_runtime.vcproj
+++ b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_runtime/sdo_runtime.vcproj
diff --git a/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_samples/sdo_samples.vcproj b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_samples/sdo_samples.vcproj
index 6a27381a8f..6a27381a8f 100644
--- a/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_samples/sdo_samples.vcproj
+++ b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_samples/sdo_samples.vcproj
diff --git a/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_test/sdo_test.vcproj b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_test/sdo_test.vcproj
index 825c1eb017..825c1eb017 100644
--- a/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_test/sdo_test.vcproj
+++ b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_test/sdo_test.vcproj
diff --git a/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.sln b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.sln
index dd45b4bde6..dd45b4bde6 100644
--- a/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.sln
+++ b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.sln
diff --git a/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.suo b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.suo
index 161181fc60..161181fc60 100644
--- a/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.suo
+++ b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.suo
diff --git a/branches/cpp-M1/sdo/runtime/Makefile.am b/sca-cpp/branches/cpp-M1/sdo/runtime/Makefile.am
index 527708855b..527708855b 100644
--- a/branches/cpp-M1/sdo/runtime/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/Makefile.am
diff --git a/branches/cpp-M1/sdo/runtime/core/Makefile.am b/sca-cpp/branches/cpp-M1/sdo/runtime/core/Makefile.am
index 1b3ddb9c93..1b3ddb9c93 100644
--- a/branches/cpp-M1/sdo/runtime/core/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/Makefile.am
diff --git a/branches/cpp-M1/sdo/runtime/core/sdo_axiom/Makefile.am b/sca-cpp/branches/cpp-M1/sdo/runtime/core/sdo_axiom/Makefile.am
index 7339b49e97..7339b49e97 100644
--- a/branches/cpp-M1/sdo/runtime/core/sdo_axiom/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/sdo_axiom/Makefile.am
diff --git a/branches/cpp-M1/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp
index 0d71d9802e..0d71d9802e 100644
--- a/branches/cpp-M1/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/sdo_axiom/sdo_axiom.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/sdo_axiom/sdo_axiom.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/sdo_axiom/sdo_axiom.h
index 631c1c9437..631c1c9437 100644
--- a/branches/cpp-M1/sdo/runtime/core/sdo_axiom/sdo_axiom.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/sdo_axiom/sdo_axiom.h
diff --git a/branches/cpp-M1/sdo/runtime/core/sdo_axiom/sdo_axiom_export.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/sdo_axiom/sdo_axiom_export.h
index 70d6b813f7..70d6b813f7 100644
--- a/branches/cpp-M1/sdo/runtime/core/sdo_axiom/sdo_axiom_export.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/sdo_axiom/sdo_axiom_export.h
diff --git a/branches/cpp-M1/sdo/runtime/core/sdo_axiom_test/Makefile.am b/sca-cpp/branches/cpp-M1/sdo/runtime/core/sdo_axiom_test/Makefile.am
index 69acb6e9da..69acb6e9da 100644
--- a/branches/cpp-M1/sdo/runtime/core/sdo_axiom_test/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/sdo_axiom_test/Makefile.am
diff --git a/branches/cpp-M1/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.cpp
index 31d4e2b029..31d4e2b029 100644
--- a/branches/cpp-M1/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.h
index d4756546b7..d4756546b7 100644
--- a/branches/cpp-M1/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/sdo_axiom_test/sdo_axiom_test.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/.cdtbuild b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/.cdtbuild
index 7c9117ffae..7c9117ffae 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/.cdtbuild
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/.cdtbuild
diff --git a/branches/cpp-M1/sdo/runtime/core/src/.cdtproject b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/.cdtproject
index 48a12e6664..48a12e6664 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/.cdtproject
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/.cdtproject
diff --git a/branches/cpp-M1/sdo/runtime/core/src/.project b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/.project
index a24e25672e..a24e25672e 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/.project
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/.project
diff --git a/branches/cpp-M1/sdo/runtime/core/src/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/.settings/org.eclipse.cdt.managedbuilder.core.prefs
index 37a23c6dd7..37a23c6dd7 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/.settings/org.eclipse.cdt.managedbuilder.core.prefs
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/.settings/org.eclipse.cdt.managedbuilder.core.prefs
diff --git a/branches/cpp-M1/sdo/runtime/core/src/Makefile.am b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/Makefile.am
index b24de0f89f..b24de0f89f 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/Makefile.am
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/Makefile.am b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/Makefile.am
index 82055487b0..82055487b0 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/Makefile.am
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummary.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummary.cpp
index 42e45603ce..42e45603ce 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummary.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummary.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummary.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummary.h
index 01929ce311..01929ce311 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummary.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummary.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.cpp
index 46146d0045..46146d0045 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.h
index 903ef0f427..903ef0f427 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.cpp
index 6fefb289d9..6fefb289d9 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.h
index 38ca468484..38ca468484 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectList.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectList.h
index e28973041f..e28973041f 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectList.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectList.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.cpp
index 7462376f01..7462376f01 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.h
index 9587a8402d..9587a8402d 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp
index 9581160044..9581160044 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/CopyHelper.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/CopyHelper.h
index 954333a15b..954333a15b 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/CopyHelper.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/CopyHelper.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASProperty.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASProperty.cpp
index ed4dc5f8ba..ed4dc5f8ba 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASProperty.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASProperty.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASProperty.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASProperty.h
index 9cff3a7967..9cff3a7967 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASProperty.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASProperty.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASType.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASType.cpp
index d249f1a2f0..d249f1a2f0 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASType.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASType.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASType.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASType.h
index 56f0fa2571..56f0fa2571 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASType.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASType.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASValue.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASValue.cpp
index 66f493b84e..66f493b84e 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASValue.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASValue.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASValue.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASValue.h
index f15a24aae4..f15a24aae4 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASValue.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASValue.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASValues.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASValues.cpp
index aac9702cfd..aac9702cfd 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASValues.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASValues.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASValues.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASValues.h
index 6c5ba835c3..6c5ba835c3 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASValues.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DASValues.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataFactory.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataFactory.cpp
index 026ed5c871..026ed5c871 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataFactory.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataFactory.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataFactory.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataFactory.h
index 7ee7b1b229..7ee7b1b229 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataFactory.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataFactory.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp
index d3cb033c6e..d3cb033c6e 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.h
index 046160bc71..046160bc71 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataGraph.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataGraph.cpp
index a367853f06..a367853f06 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataGraph.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataGraph.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataGraph.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataGraph.h
index 715223992a..715223992a 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataGraph.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataGraph.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataGraphImpl.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataGraphImpl.cpp
index 636dbed25f..636dbed25f 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataGraphImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataGraphImpl.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataGraphImpl.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataGraphImpl.h
index 15cc994171..15cc994171 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataGraphImpl.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataGraphImpl.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObject.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObject.cpp
index 190da0649e..190da0649e 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObject.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObject.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObject.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObject.h
index 0e538b27ab..0e538b27ab 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObject.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObject.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp
index 0188c26d6d..0188c26d6d 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.h
index b3a0d7dd13..b3a0d7dd13 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.cpp
index 67f54949c8..67f54949c8 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.h
index 766392fbaa..766392fbaa 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectInstance.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectList.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectList.cpp
index 7202833360..7202833360 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectList.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectList.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectList.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectList.h
index 04ad42b3c0..04ad42b3c0 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectList.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectList.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp
index 25ef2a266b..25ef2a266b 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.h
index 78af3a0ea5..78af3a0ea5 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DefaultLogWriter.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DefaultLogWriter.cpp
index bfd75a18fb..bfd75a18fb 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DefaultLogWriter.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DefaultLogWriter.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DefaultLogWriter.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DefaultLogWriter.h
index e9b5318c4e..e9b5318c4e 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DefaultLogWriter.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/DefaultLogWriter.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/EqualityHelper.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/EqualityHelper.cpp
index 603c24891e..603c24891e 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/EqualityHelper.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/EqualityHelper.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/EqualityHelper.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/EqualityHelper.h
index 381564338c..381564338c 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/EqualityHelper.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/EqualityHelper.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/GroupDefinition.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/GroupDefinition.cpp
index 57870a7516..57870a7516 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/GroupDefinition.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/GroupDefinition.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/GroupDefinition.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/GroupDefinition.h
index 685c1119e8..685c1119e8 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/GroupDefinition.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/GroupDefinition.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/GroupEvent.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/GroupEvent.cpp
index adad37ff82..adad37ff82 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/GroupEvent.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/GroupEvent.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/GroupEvent.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/GroupEvent.h
index a2ae966398..a2ae966398 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/GroupEvent.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/GroupEvent.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/HelperProvider.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/HelperProvider.cpp
index b41c47a501..b41c47a501 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/HelperProvider.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/HelperProvider.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/HelperProvider.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/HelperProvider.h
index 7be271f128..7be271f128 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/HelperProvider.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/HelperProvider.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/LogWriter.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/LogWriter.cpp
index 79f7d48671..79f7d48671 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/LogWriter.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/LogWriter.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/LogWriter.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/LogWriter.h
index 9948c86ed9..9948c86ed9 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/LogWriter.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/LogWriter.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Logger.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Logger.cpp
index 6d799f2435..6d799f2435 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Logger.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Logger.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Logger.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Logger.h
index ee566e9c44..ee566e9c44 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Logger.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Logger.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Logging.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Logging.h
index e2adac2d84..e2adac2d84 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Logging.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Logging.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Makefile.am b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Makefile.am
index 7bc7726be7..7bc7726be7 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Makefile.am
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ParserErrorSetter.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ParserErrorSetter.cpp
index 2d9a99360f..2d9a99360f 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ParserErrorSetter.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ParserErrorSetter.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ParserErrorSetter.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ParserErrorSetter.h
index f4261c1154..f4261c1154 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ParserErrorSetter.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/ParserErrorSetter.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Property.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Property.cpp
index 11fc167377..11fc167377 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Property.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Property.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Property.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Property.h
index 2bd52c9ab2..2bd52c9ab2 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Property.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Property.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.cpp
index e83e66d656..e83e66d656 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.h
index cb6df88d5f..cb6df88d5f 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.cpp
index 39b0766b84..39b0766b84 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.h
index fc0e69a496..fc0e69a496 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyImpl.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyImpl.cpp
index ff32f0c33d..ff32f0c33d 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyImpl.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyImpl.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyImpl.h
index 3b0838db2c..3b0838db2c 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyImpl.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyImpl.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyList.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyList.cpp
index 5da678f10b..5da678f10b 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyList.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyList.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyList.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyList.h
index 61146f18db..61146f18db 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyList.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertyList.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertySetting.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertySetting.cpp
index 17ac9de09e..17ac9de09e 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertySetting.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertySetting.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertySetting.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertySetting.h
index 4a87e1bc9e..4a87e1bc9e 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertySetting.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/PropertySetting.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/RefCountingObject.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/RefCountingObject.cpp
index e763ad5a9a..e763ad5a9a 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/RefCountingObject.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/RefCountingObject.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/RefCountingObject.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/RefCountingObject.h
index 2d5724a8f5..2d5724a8f5 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/RefCountingObject.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/RefCountingObject.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.cpp
index a9dabd10b4..a9dabd10b4 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.h
index 34d534d1c0..34d534d1c0 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Attribute.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Attribute.cpp
index 921b13fe02..921b13fe02 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Attribute.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Attribute.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Attribute.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Attribute.h
index a8657ab6ef..a8657ab6ef 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Attribute.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Attribute.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.cpp
index 145f91ed1d..145f91ed1d 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.h
index 0a0ce792a3..0a0ce792a3 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Namespaces.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Namespaces.cpp
index ae99c4949e..ae99c4949e 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Namespaces.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Namespaces.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Namespaces.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Namespaces.h
index d100889544..d100889544 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Namespaces.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Namespaces.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Parser.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Parser.cpp
index b38c67061d..b38c67061d 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Parser.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Parser.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Parser.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Parser.h
index 6e81bc98b7..6e81bc98b7 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Parser.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SAX2Parser.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDO.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDO.h
index 674edf0719..674edf0719 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDO.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDO.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDODate.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDODate.cpp
index 50ae8b2297..50ae8b2297 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDODate.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDODate.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDODate.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDODate.h
index da900cb298..da900cb298 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDODate.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDODate.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDORuntimeException.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDORuntimeException.cpp
index 4a60d78f0d..4a60d78f0d 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDORuntimeException.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDORuntimeException.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDORuntimeException.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDORuntimeException.h
index 12036f0db1..12036f0db1 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDORuntimeException.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDORuntimeException.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp
index 8240503337..8240503337 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.h
index 4a985a8c02..4a985a8c02 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSPI.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSPI.h
index 1165514123..1165514123 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSPI.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSPI.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp
index c9476ca867..c9476ca867 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.h
index c3cd319183..c3cd319183 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOString.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOString.cpp
index e291c38f76..e291c38f76 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOString.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOString.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOString.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOString.h
index 2452a7f3a7..2452a7f3a7 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOString.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOString.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOUtils.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOUtils.cpp
index 8916400144..8916400144 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOUtils.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOUtils.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOUtils.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOUtils.h
index 0fed291164..0fed291164 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOUtils.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOUtils.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLBufferWriter.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLBufferWriter.cpp
index 6812ef166b..6812ef166b 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLBufferWriter.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLBufferWriter.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLBufferWriter.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLBufferWriter.h
index 489f44b86c..489f44b86c 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLBufferWriter.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLBufferWriter.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLFileWriter.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLFileWriter.cpp
index 09d80075c9..09d80075c9 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLFileWriter.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLFileWriter.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLFileWriter.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLFileWriter.h
index cddfb41293..cddfb41293 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLFileWriter.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLFileWriter.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLStreamWriter.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLStreamWriter.cpp
index 00d76b1b6e..00d76b1b6e 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLStreamWriter.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLStreamWriter.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLStreamWriter.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLStreamWriter.h
index 92bbfa3cf0..92bbfa3cf0 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLStreamWriter.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLStreamWriter.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLString.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLString.cpp
index 248df58a7f..248df58a7f 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLString.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLString.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLString.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLString.h
index 9cbf48be1d..9cbf48be1d 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLString.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLString.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp
index baf3a762cb..baf3a762cb 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.h
index b862a492e1..b862a492e1 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDBufferWriter.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDBufferWriter.cpp
index e92b0eb48e..e92b0eb48e 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDBufferWriter.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDBufferWriter.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDBufferWriter.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDBufferWriter.h
index a923c32bd1..a923c32bd1 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDBufferWriter.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDBufferWriter.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDFileWriter.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDFileWriter.cpp
index e0a5b78de4..e0a5b78de4 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDFileWriter.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDFileWriter.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDFileWriter.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDFileWriter.h
index b85b88bbc4..b85b88bbc4 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDFileWriter.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDFileWriter.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDStreamWriter.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDStreamWriter.cpp
index 664dbe1c6f..664dbe1c6f 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDStreamWriter.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDStreamWriter.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDStreamWriter.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDStreamWriter.h
index 5f80536f4d..5f80536f4d 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDStreamWriter.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDStreamWriter.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.cpp
index d80b6cc9e4..d80b6cc9e4 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.h
index 88ab27fbe6..88ab27fbe6 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SchemaInfo.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SchemaInfo.cpp
index 024546876a..024546876a 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SchemaInfo.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SchemaInfo.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SchemaInfo.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SchemaInfo.h
index 0488df1893..0488df1893 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SchemaInfo.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SchemaInfo.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SdoCheck.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SdoCheck.cpp
index d577d5bd12..d577d5bd12 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SdoCheck.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SdoCheck.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SdoCheck.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SdoCheck.h
index daf28c6d6f..daf28c6d6f 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SdoCheck.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SdoCheck.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SdoRuntime.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SdoRuntime.cpp
index 175dc6dbd2..175dc6dbd2 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SdoRuntime.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SdoRuntime.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SdoRuntime.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SdoRuntime.h
index 5720a34a0c..5720a34a0c 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SdoRuntime.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SdoRuntime.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Sequence.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Sequence.cpp
index 3e830e9889..3e830e9889 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Sequence.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Sequence.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Sequence.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Sequence.h
index 610848ce98..610848ce98 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Sequence.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Sequence.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SequenceImpl.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SequenceImpl.cpp
index 37be7881be..37be7881be 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SequenceImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SequenceImpl.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SequenceImpl.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SequenceImpl.h
index 620de1187d..620de1187d 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SequenceImpl.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SequenceImpl.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Setting.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Setting.cpp
index 6aa8dab8b6..6aa8dab8b6 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Setting.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Setting.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Setting.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Setting.h
index 37de243716..37de243716 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Setting.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Setting.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SettingList.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SettingList.cpp
index 2617f49289..2617f49289 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SettingList.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SettingList.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SettingList.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SettingList.h
index 63089a1b70..63089a1b70 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SettingList.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/SettingList.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Type.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Type.cpp
index 3f381ed1cf..3f381ed1cf 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Type.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Type.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Type.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Type.h
index 7b7b939d6e..7b7b939d6e 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Type.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/Type.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinition.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinition.cpp
index f96d3ae138..f96d3ae138 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinition.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinition.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinition.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinition.h
index 4b4d9a1f86..4b4d9a1f86 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinition.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinition.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.cpp
index 31a64a91da..31a64a91da 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.h
index 2a4f8e90cf..2a4f8e90cf 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.cpp
index 2bea93494c..2bea93494c 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.h
index 4b95fe8b94..4b95fe8b94 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.cpp
index 82fd8ac11b..82fd8ac11b 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.h
index b523a3316a..b523a3316a 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp
index 041f492a55..041f492a55 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeImpl.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeImpl.h
index 5a8bcec2e7..5a8bcec2e7 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeImpl.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeImpl.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeList.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeList.cpp
index ec86a95eb2..ec86a95eb2 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeList.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeList.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeList.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeList.h
index bdc20cbfe3..bdc20cbfe3 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeList.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/TypeList.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLDocument.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLDocument.cpp
index b16b2eedff..b16b2eedff 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLDocument.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLDocument.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLDocument.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLDocument.h
index 4737fa9d03..4737fa9d03 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLDocument.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLDocument.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLDocumentImpl.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLDocumentImpl.cpp
index 88e93ad480..88e93ad480 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLDocumentImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLDocumentImpl.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLDocumentImpl.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLDocumentImpl.h
index a799ba90f2..a799ba90f2 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLDocumentImpl.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLDocumentImpl.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLHelper.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLHelper.cpp
index 3b0648ce10..3b0648ce10 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLHelper.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLHelper.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLHelper.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLHelper.h
index f9e280583e..f9e280583e 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLHelper.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLHelper.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.cpp
index b2889ac195..b2889ac195 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.h
index 302a9e5072..302a9e5072 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLQName.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLQName.cpp
index de03d3affb..de03d3affb 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLQName.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLQName.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLQName.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLQName.h
index 9548a737d0..9548a737d0 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLQName.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XMLQName.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDHelper.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDHelper.cpp
index 6c9ce98127..6c9ce98127 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDHelper.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDHelper.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDHelper.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDHelper.h
index 9457176e89..9457176e89 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDHelper.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDHelper.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.cpp
index 7b918c576e..7b918c576e 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.h
index 791d1229ce..791d1229ce 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.cpp
index 9d001232cb..9d001232cb 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.h
index 26307411a0..26307411a0 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.cpp
index f0ae973195..f0ae973195 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.h
index 596766368c..596766368c 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XpathHelper.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XpathHelper.cpp
index c53c577c2d..c53c577c2d 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XpathHelper.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XpathHelper.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XpathHelper.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XpathHelper.h
index 862c89d307..862c89d307 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XpathHelper.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/XpathHelper.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/disable_warn.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/disable_warn.h
index 7743ab55de..7743ab55de 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/disable_warn.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/disable_warn.h
diff --git a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/export.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/export.h
index 51470a585b..51470a585b 100644
--- a/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/export.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/src/commonj/sdo/export.h
diff --git a/branches/cpp-M1/sdo/runtime/core/test/.cdtbuild b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/.cdtbuild
index 17ebd43324..17ebd43324 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/.cdtbuild
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/.cdtbuild
diff --git a/branches/cpp-M1/sdo/runtime/core/test/.cdtproject b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/.cdtproject
index 48a12e6664..48a12e6664 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/.cdtproject
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/.cdtproject
diff --git a/branches/cpp-M1/sdo/runtime/core/test/.project b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/.project
index 32920ef4cf..32920ef4cf 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/.project
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/.project
diff --git a/branches/cpp-M1/sdo/runtime/core/test/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/.settings/org.eclipse.cdt.managedbuilder.core.prefs
index 0c77f0af0f..0c77f0af0f 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/.settings/org.eclipse.cdt.managedbuilder.core.prefs
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/.settings/org.eclipse.cdt.managedbuilder.core.prefs
diff --git a/branches/cpp-M1/sdo/runtime/core/test/47293Catalog-out.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/47293Catalog-out.xsd
index c56a4c341e..c56a4c341e 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/47293Catalog-out.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/47293Catalog-out.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/47293Catalog.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/47293Catalog.xml
index 809aced5a0..809aced5a0 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/47293Catalog.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/47293Catalog.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/47293Catalog.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/47293Catalog.xsd
index 28fd9d2f31..28fd9d2f31 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/47293Catalog.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/47293Catalog.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/47293Customer.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/47293Customer.xsd
index 8471db253b..8471db253b 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/47293Customer.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/47293Customer.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/47293Order.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/47293Order.xsd
index 00036ae870..00036ae870 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/47293Order.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/47293Order.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/48601.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/48601.xsd
index a5ef35ed7c..a5ef35ed7c 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/48601.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/48601.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/48686.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/48686.xml
index 19e3ea93fe..19e3ea93fe 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/48686.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/48686.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/48686.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/48686.xsd
index c06650bba6..c06650bba6 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/48686.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/48686.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/48736.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/48736.xml
index 9fe7208345..9fe7208345 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/48736.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/48736.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/48736.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/48736.xsd
index 1d531f9d11..1d531f9d11 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/48736.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/48736.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/48736_xml.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/48736_xml.txt
index d7b9d4b8d4..d7b9d4b8d4 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/48736_xml.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/48736_xml.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/48736_xsd.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/48736_xsd.txt
index 822a05ec7f..822a05ec7f 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/48736_xsd.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/48736_xsd.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/Atom1.0.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Atom1.0.xsd
index 67942de547..67942de547 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/Atom1.0.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Atom1.0.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/BadElement.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/BadElement.xml
index 981287237a..981287237a 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/BadElement.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/BadElement.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/BadElement.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/BadElement.xsd
index 84af953576..84af953576 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/BadElement.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/BadElement.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/Catalog.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Catalog.xsd
index 23f3363394..23f3363394 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/Catalog.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Catalog.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/Customer.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Customer.xsd
index 670a804109..670a804109 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/Customer.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Customer.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/Makefile.am b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Makefile.am
index 09c11205d7..09c11205d7 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Makefile.am
diff --git a/branches/cpp-M1/sdo/runtime/core/test/OddChars.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/OddChars.xml
index 920ef3c8bb..920ef3c8bb 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/OddChars.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/OddChars.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/OddChars.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/OddChars.xsd
index 84af953576..84af953576 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/OddChars.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/OddChars.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/Order.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Order.xsd
index 4dbbad9507..4dbbad9507 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/Order.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Order.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/SdoGenerate.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/SdoGenerate.cpp
index 375f72d3d8..375f72d3d8 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/SdoGenerate.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/SdoGenerate.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/test/StockQuoteService.wsdl b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/StockQuoteService.wsdl
index 4917cde583..4917cde583 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/StockQuoteService.wsdl
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/StockQuoteService.wsdl
diff --git a/branches/cpp-M1/sdo/runtime/core/test/Style1.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Style1.xsd
index 8ff9357ef9..8ff9357ef9 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/Style1.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Style1.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/Style2.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Style2.xsd
index 651a098956..651a098956 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/Style2.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Style2.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/Style3.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Style3.xsd
index af224db483..af224db483 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/Style3.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Style3.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/Style4.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Style4.xsd
index 8ff8547f50..8ff8547f50 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/Style4.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/Style4.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/TravelBookingSchema.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/TravelBookingSchema.xsd
index 84af953576..84af953576 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/TravelBookingSchema.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/TravelBookingSchema.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/TravelBookingUsingSchema.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/TravelBookingUsingSchema.xml
index 80bcad875b..80bcad875b 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/TravelBookingUsingSchema.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/TravelBookingUsingSchema.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/axis.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/axis.xsd
index 3ea0033a7c..3ea0033a7c 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/axis.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/axis.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b46617.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b46617.xml
index 84a51b73ec..84a51b73ec 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b46617.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b46617.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b46617.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b46617.xsd
index ea75c0c8b9..ea75c0c8b9 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b46617.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b46617.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b46617b.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b46617b.xml
index 3ccd70a40b..3ccd70a40b 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b46617b.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b46617b.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b46617b.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b46617b.xsd
index ae0d3a4bda..ae0d3a4bda 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b46617b.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b46617b.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b46633.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b46633.txt
index da34a5196e..da34a5196e 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b46633.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b46633.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b46634_out.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b46634_out.txt
index b228d4052c..b228d4052c 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b46634_out.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b46634_out.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b46634_out.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b46634_out.xml
index b228d4052c..b228d4052c 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b46634_out.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b46634_out.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b46693.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b46693.xsd
index 8488597741..8488597741 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b46693.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b46693.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b47137.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b47137.txt
index d525bd7776..d525bd7776 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b47137.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b47137.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b47137.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b47137.xsd
index 90f78c7398..90f78c7398 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b47137.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b47137.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b47137_out.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b47137_out.xml
index 1bb06f8f0a..1bb06f8f0a 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b47137_out.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b47137_out.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b47137b.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b47137b.txt
index 202a17fc21..202a17fc21 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b47137b.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b47137b.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b47137b.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b47137b.xsd
index 5282a4b4ba..5282a4b4ba 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b47137b.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b47137b.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b47137b_out.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b47137b_out.xml
index 28de3c4f9f..28de3c4f9f 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b47137b_out.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b47137b_out.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b47293.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b47293.txt
index 9d571da67c..9d571da67c 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b47293.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b47293.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b48602.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48602.xsd
index dcb288f86a..dcb288f86a 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b48602.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48602.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b48633.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48633.xml
index ffb7a039d4..ffb7a039d4 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b48633.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48633.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b48633.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48633.xsd
index 0a7c526c02..0a7c526c02 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b48633.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48633.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b48633_xml.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48633_xml.txt
index 7c0425d298..7c0425d298 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b48633_xml.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48633_xml.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b48633b.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48633b.xsd
index c9bca4a9c3..c9bca4a9c3 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b48633b.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48633b.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b48633b_xsd.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48633b_xsd.txt
index 0836fda6cd..0836fda6cd 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b48633b_xsd.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48633b_xsd.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b48636.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48636.xml
index 1edcdf37c1..1edcdf37c1 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b48636.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48636.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b48636.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48636.xsd
index 5387611997..5387611997 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b48636.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48636.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b48636_xml.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48636_xml.txt
index 4b5b55ced7..4b5b55ced7 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b48636_xml.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48636_xml.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b48636_xsd.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48636_xsd.txt
index 81ccaee474..81ccaee474 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b48636_xsd.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48636_xsd.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b48686.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48686.xml
index 19e3ea93fe..19e3ea93fe 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b48686.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48686.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b48686.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48686.xsd
index c06650bba6..c06650bba6 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b48686.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48686.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b48686_xml.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48686_xml.txt
index f4899d810e..f4899d810e 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b48686_xml.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48686_xml.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/b48686_xsd.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48686_xsd.txt
index df670b8066..df670b8066 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/b48686_xsd.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/b48686_xsd.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/badelement.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/badelement.txt
index f9ddc1e3b1..f9ddc1e3b1 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/badelement.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/badelement.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bothgroups.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bothgroups.xsd
index d5a27a8cd5..d5a27a8cd5 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bothgroups.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bothgroups.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bothgroups_xsd.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bothgroups_xsd.txt
index 5d92da21c5..5d92da21c5 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bothgroups_xsd.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bothgroups_xsd.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bothgroupssamename.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bothgroupssamename.xsd
index 4648a9e917..4648a9e917 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bothgroupssamename.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bothgroupssamename.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bothgroupssamename_xsd.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bothgroupssamename_xsd.txt
index 5d92da21c5..5d92da21c5 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bothgroupssamename_xsd.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bothgroupssamename_xsd.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bug2.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bug2.txt
index aae01a0c9c..aae01a0c9c 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bug2.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bug2.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bug45933-output.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bug45933-output.txt
index 366d41ef02..366d41ef02 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bug45933-output.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bug45933-output.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bug45933-output.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bug45933-output.xml
index 366d41ef02..366d41ef02 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bug45933-output.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bug45933-output.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bug48300.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bug48300.xml
index 77ccd72ba6..77ccd72ba6 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bug48300.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bug48300.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bug48300.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bug48300.xsd
index e6bdb8128b..e6bdb8128b 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bug48300.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bug48300.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bug48300_xml.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bug48300_xml.txt
index d8b1345d0d..d8b1345d0d 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bug48300_xml.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bug48300_xml.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bug48300_xsd.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bug48300_xsd.txt
index 38d7c904f0..38d7c904f0 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bug48300_xsd.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bug48300_xsd.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bugs/1/company.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bugs/1/company.xml
index 8e130ae2aa..8e130ae2aa 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bugs/1/company.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bugs/1/company.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bugs/1/company.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bugs/1/company.xsd
index 34a66c282a..34a66c282a 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bugs/1/company.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bugs/1/company.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bugs/1/include.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bugs/1/include.xsd
index f2df5c1695..f2df5c1695 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bugs/1/include.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bugs/1/include.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bugs/1/ok1.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bugs/1/ok1.xsd
index e8bea67b49..e8bea67b49 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bugs/1/ok1.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bugs/1/ok1.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bugs/1/ok2.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bugs/1/ok2.xsd
index 9cecce2f7f..9cecce2f7f 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bugs/1/ok2.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bugs/1/ok2.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bugs/1/ok3.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bugs/1/ok3.xsd
index f5bba60269..f5bba60269 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bugs/1/ok3.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bugs/1/ok3.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bunique-out.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bunique-out.txt
index da1aabead7..da1aabead7 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bunique-out.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bunique-out.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bunique-out.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bunique-out.xml
index 44650e05a4..44650e05a4 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bunique-out.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bunique-out.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bunique-out.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bunique-out.xsd
index da1aabead7..da1aabead7 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bunique-out.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bunique-out.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bunique-out.xsd_safe.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bunique-out.xsd_safe.txt
index 1b4c6bb7da..1b4c6bb7da 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bunique-out.xsd_safe.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bunique-out.xsd_safe.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/bunique-outxml.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bunique-outxml.txt
index 44650e05a4..44650e05a4 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/bunique-outxml.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/bunique-outxml.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/buniqueread-out.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/buniqueread-out.txt
index 44650e05a4..44650e05a4 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/buniqueread-out.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/buniqueread-out.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/buniqueread-out.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/buniqueread-out.xml
index 44650e05a4..44650e05a4 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/buniqueread-out.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/buniqueread-out.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/buniqueread-out.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/buniqueread-out.xsd
index 3b8cdffd61..3b8cdffd61 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/buniqueread-out.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/buniqueread-out.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/calculator.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/calculator.xsd
index d04b0c22e1..d04b0c22e1 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/calculator.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/calculator.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/calculator2.wsdl b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/calculator2.wsdl
index 93cdce8874..93cdce8874 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/calculator2.wsdl
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/calculator2.wsdl
diff --git a/branches/cpp-M1/sdo/runtime/core/test/calculator2a.wsdl b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/calculator2a.wsdl
index eb17b03db7..eb17b03db7 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/calculator2a.wsdl
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/calculator2a.wsdl
diff --git a/branches/cpp-M1/sdo/runtime/core/test/carotest3.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/carotest3.txt
index cb5e4ed9b3..cb5e4ed9b3 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/carotest3.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/carotest3.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/company.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/company.xsd
index 2c7769167a..2c7769167a 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/company.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/company.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/company_with_nillable_SN.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/company_with_nillable_SN.xml
index 16a32223ab..16a32223ab 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/company_with_nillable_SN.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/company_with_nillable_SN.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/company_with_nillable_SN.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/company_with_nillable_SN.xsd
index 808e075a2d..808e075a2d 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/company_with_nillable_SN.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/company_with_nillable_SN.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/companyabs.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/companyabs.xsd
index f8a1577daf..f8a1577daf 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/companyabs.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/companyabs.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/companyref.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/companyref.xsd
index 614dca1752..614dca1752 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/companyref.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/companyref.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/companysubs.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/companysubs.xsd
index f71e07dbee..f71e07dbee 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/companysubs.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/companysubs.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/csload-output.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/csload-output.txt
index b4c0b2d911..b4c0b2d911 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/csload-output.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/csload-output.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/csload-output.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/csload-output.xml
index b4c0b2d911..b4c0b2d911 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/csload-output.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/csload-output.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/csload2-output.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/csload2-output.txt
index 82175d4d13..82175d4d13 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/csload2-output.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/csload2-output.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/csload2-output.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/csload2-output.xml
index 82175d4d13..82175d4d13 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/csload2-output.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/csload2-output.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/csload3-output.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/csload3-output.txt
index 82175d4d13..82175d4d13 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/csload3-output.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/csload3-output.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/csload3-output.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/csload3-output.xml
index 82175d4d13..82175d4d13 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/csload3-output.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/csload3-output.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/cssave-output.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/cssave-output.txt
index 9490166774..9490166774 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/cssave-output.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/cssave-output.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/cssave-output.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/cssave-output.xml
index 9490166774..9490166774 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/cssave-output.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/cssave-output.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/cssave2-output.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/cssave2-output.txt
index cce98c2591..cce98c2591 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/cssave2-output.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/cssave2-output.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/cssave2-output.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/cssave2-output.xml
index cce98c2591..cce98c2591 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/cssave2-output.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/cssave2-output.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/datetest.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/datetest.txt
index 3da923ea55..3da923ea55 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/datetest.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/datetest.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/defaults.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/defaults.txt
index 1cdba8ea05..1cdba8ea05 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/defaults.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/defaults.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/doctest.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/doctest.txt
index b08b52a605..b08b52a605 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/doctest.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/doctest.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/doctest.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/doctest.xml
index 9a865fc160..9a865fc160 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/doctest.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/doctest.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/doctest.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/doctest.xsd
index a507785277..a507785277 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/doctest.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/doctest.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/employee.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/employee.xsd
index d219afc522..d219afc522 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/employee.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/employee.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/emptycs1.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/emptycs1.txt
index 30b469181d..30b469181d 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/emptycs1.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/emptycs1.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/emptycs1.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/emptycs1.xml
index 30b469181d..30b469181d 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/emptycs1.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/emptycs1.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/emptycs2.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/emptycs2.txt
index 596c51091d..596c51091d 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/emptycs2.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/emptycs2.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/emptycs2.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/emptycs2.xml
index 596c51091d..596c51091d 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/emptycs2.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/emptycs2.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/emptycs3.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/emptycs3.txt
index 14e33b7c55..14e33b7c55 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/emptycs3.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/emptycs3.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/emptycs3.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/emptycs3.xml
index 14e33b7c55..14e33b7c55 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/emptycs3.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/emptycs3.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/error1.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/error1.xml
index 16a32223ab..16a32223ab 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/error1.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/error1.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/error1.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/error1.xsd
index ae8130189c..ae8130189c 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/error1.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/error1.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/extension.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/extension.xsd
index 247380ceba..247380ceba 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/extension.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/extension.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/g/gCustomer.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/g/gCustomer.xsd
index 1671c987bf..1671c987bf 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/g/gCustomer.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/g/gCustomer.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/g/gOrder.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/g/gOrder.xml
index 7beea167d3..7beea167d3 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/g/gOrder.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/g/gOrder.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/g/gOrder.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/g/gOrder.xsd
index d4e0ff832e..d4e0ff832e 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/g/gOrder.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/g/gOrder.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/g3.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/g3.xsd
index c70d00aa43..c70d00aa43 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/g3.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/g3.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/getproptest.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/getproptest.txt
index f6bea1325d..f6bea1325d 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/getproptest.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/getproptest.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/graham1.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/graham1.xsd
index dbab303cd7..dbab303cd7 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/graham1.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/graham1.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/graham2.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/graham2.xsd
index 6c8f68beb7..6c8f68beb7 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/graham2.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/graham2.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/graham3.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/graham3.xsd
index 9123233b43..9123233b43 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/graham3.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/graham3.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/groupingroup.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/groupingroup.xsd
index dd13042e8a..dd13042e8a 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/groupingroup.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/groupingroup.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/groupingroup_xsd.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/groupingroup_xsd.txt
index 7eba22a274..7eba22a274 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/groupingroup_xsd.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/groupingroup_xsd.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/grouprefingroup.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/grouprefingroup.xsd
index d10195a4fd..d10195a4fd 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/grouprefingroup.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/grouprefingroup.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/grouprefingroup_xsd.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/grouprefingroup_xsd.txt
index f879c8adb2..f879c8adb2 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/grouprefingroup_xsd.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/grouprefingroup_xsd.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/grouptoolate.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/grouptoolate.xsd
index 3274282966..3274282966 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/grouptoolate.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/grouptoolate.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/grouptoolate_xsd.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/grouptoolate_xsd.txt
index 81ccaee474..81ccaee474 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/grouptoolate_xsd.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/grouptoolate_xsd.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/groupwithprefix.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/groupwithprefix.xsd
index a2f5c5fd49..a2f5c5fd49 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/groupwithprefix.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/groupwithprefix.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/groupwithprefix_xsd.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/groupwithprefix_xsd.txt
index 81ccaee474..81ccaee474 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/groupwithprefix_xsd.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/groupwithprefix_xsd.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/groupwrongname.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/groupwrongname.xsd
index c30bc45421..c30bc45421 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/groupwrongname.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/groupwrongname.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/inc1.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/inc1.txt
index bf517ec394..bf517ec394 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/inc1.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/inc1.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/inc2.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/inc2.txt
index ac4a97479f..ac4a97479f 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/inc2.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/inc2.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/include.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/include.xsd
index 8e89ef40ec..8e89ef40ec 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/include.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/include.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/include1.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/include1.xsd
index 65f71c48a6..65f71c48a6 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/include1.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/include1.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/include2.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/include2.xsd
index 329fd17761..329fd17761 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/include2.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/include2.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/includeother3.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/includeother3.xsd
index b6ec93f0ba..b6ec93f0ba 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/includeother3.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/includeother3.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/list1.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/list1.xml
index 449a9e8b8b..449a9e8b8b 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/list1.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/list1.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/list1.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/list1.xsd
index c702cb47c8..c702cb47c8 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/list1.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/list1.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/list1_xml.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/list1_xml.txt
index ddf8e8ac22..ddf8e8ac22 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/list1_xml.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/list1_xml.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/list1_xsd.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/list1_xsd.txt
index 2adeaf3a7c..2adeaf3a7c 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/list1_xsd.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/list1_xsd.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/loadload-output.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/loadload-output.txt
index a6df48b1be..a6df48b1be 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/loadload-output.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/loadload-output.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/loadload-output.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/loadload-output.xml
index a6df48b1be..a6df48b1be 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/loadload-output.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/loadload-output.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/main.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/main.cpp
index b95587b7f3..b95587b7f3 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/main.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/main.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/test/maintest.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/maintest.txt
index 860a763eb5..860a763eb5 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/maintest.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/maintest.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/many.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/many.xml
index 15be354bf3..15be354bf3 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/many.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/many.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/many.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/many.xsd
index 40243b7b8d..40243b7b8d 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/many.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/many.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/matttest1.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/matttest1.txt
index 5c5200ff22..5c5200ff22 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/matttest1.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/matttest1.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/merle1.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/merle1.txt
index f0eae645b6..f0eae645b6 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/merle1.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/merle1.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/my-core.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/my-core.xsd
index 9bc25a10fb..9bc25a10fb 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/my-core.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/my-core.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/my-implementation-local-java.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/my-implementation-local-java.xsd
index a31c3f6593..a31c3f6593 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/my-implementation-local-java.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/my-implementation-local-java.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/my.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/my.xsd
index 9d39e03f47..9d39e03f47 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/my.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/my.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/notns.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/notns.txt
index a6f2bc0411..a6f2bc0411 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/notns.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/notns.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/notns.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/notns.xml
index a6f2bc0411..a6f2bc0411 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/notns.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/notns.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/nulltest.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/nulltest.txt
index 01442ec949..01442ec949 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/nulltest.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/nulltest.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/oddchars.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/oddchars.txt
index b9ed9643b3..b9ed9643b3 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/oddchars.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/oddchars.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/openloadNS.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/openloadNS.xml
index b0b7bc638f..b0b7bc638f 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/openloadNS.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/openloadNS.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/openloadNS.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/openloadNS.xsd
index 5d39e6488d..5d39e6488d 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/openloadNS.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/openloadNS.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/openloadNS2.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/openloadNS2.xml
index 16670a8b65..16670a8b65 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/openloadNS2.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/openloadNS2.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/openloadNS2.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/openloadNS2.xsd
index 34f5fd05ff..34f5fd05ff 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/openloadNS2.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/openloadNS2.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/openloadNSout.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/openloadNSout.txt
index 742842bd3e..742842bd3e 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/openloadNSout.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/openloadNSout.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/openloadNSout.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/openloadNSout.xml
index 742842bd3e..742842bd3e 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/openloadNSout.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/openloadNSout.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/openseq.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/openseq.txt
index 44091f2608..44091f2608 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/openseq.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/openseq.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/order1.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/order1.txt
index 4f46cbfecf..4f46cbfecf 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/order1.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/order1.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/order2.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/order2.txt
index ec01027ebb..ec01027ebb 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/order2.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/order2.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/partial.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/partial.xml
index e6f51e20f0..e6f51e20f0 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/partial.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/partial.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/pete.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/pete.xml
index 1ed7514d5c..1ed7514d5c 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/pete.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/pete.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/pete.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/pete.xsd
index 5f4c0e1ac9..5f4c0e1ac9 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/pete.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/pete.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/querytest.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/querytest.txt
index 9b895282a0..9b895282a0 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/querytest.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/querytest.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/saveopen-output.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/saveopen-output.txt
index fa36e7113c..fa36e7113c 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/saveopen-output.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/saveopen-output.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/saveopen-output.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/saveopen-output.xml
index fa36e7113c..fa36e7113c 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/saveopen-output.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/saveopen-output.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/saveopen-output.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/saveopen-output.xsd
index f5066094fd..f5066094fd 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/saveopen-output.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/saveopen-output.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/sca-binding-sca.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-binding-sca.xsd
index dee53020ab..dee53020ab 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/sca-binding-sca.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-binding-sca.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/sca-binding-webservice.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-binding-webservice.xsd
index c73bffe1e8..c73bffe1e8 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/sca-binding-webservice.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-binding-webservice.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/sca-binding-ws.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-binding-ws.xsd
index 84de1db758..84de1db758 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/sca-binding-ws.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-binding-ws.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/sca-core.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-core.xsd
index 7b5c4199bf..7b5c4199bf 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/sca-core.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-core.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/sca-implementation-dll.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-implementation-dll.xsd
index a9ef738420..a9ef738420 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/sca-implementation-dll.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-implementation-dll.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/sca-implementation-java.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-implementation-java.xsd
index b5f20f2ff4..b5f20f2ff4 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/sca-implementation-java.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-implementation-java.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/sca-implementation-local-java.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-implementation-local-java.xsd
index 5c7c87ffdd..5c7c87ffdd 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/sca-implementation-local-java.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-implementation-local-java.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/sca-interface-cpp.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-interface-cpp.xsd
index 81ff6bbcf5..81ff6bbcf5 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/sca-interface-cpp.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-interface-cpp.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/sca-interface-java.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-interface-java.xsd
index fa132ff69a..fa132ff69a 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/sca-interface-java.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-interface-java.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/sca-interface-wsdl.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-interface-wsdl.xsd
index 0cfcfeaebd..0cfcfeaebd 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/sca-interface-wsdl.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-interface-wsdl.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/sca-property-java.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-property-java.xsd
index 4507752312..4507752312 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/sca-property-java.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-property-java.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/sca-property-xsd.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-property-xsd.xsd
index 7fcbd45a6a..7fcbd45a6a 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/sca-property-xsd.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca-property-xsd.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/sca.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca.xsd
index 39a39bab36..39a39bab36 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/sca.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sca.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/scenario1.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/scenario1.txt
index a0a3c7a203..a0a3c7a203 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/scenario1.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/scenario1.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/scenario2.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/scenario2.txt
index 9728bd6f0a..9728bd6f0a 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/scenario2.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/scenario2.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/scenario3.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/scenario3.txt
index e174f62538..e174f62538 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/scenario3.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/scenario3.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/scenario4.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/scenario4.txt
index f678499e15..f678499e15 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/scenario4.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/scenario4.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/scenario5.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/scenario5.txt
index af5bf47102..af5bf47102 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/scenario5.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/scenario5.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/sdotest.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sdotest.cpp
index adcdf36a0e..adcdf36a0e 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/sdotest.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sdotest.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/test/sdotest.h b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sdotest.h
index aaf309e2de..aaf309e2de 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/sdotest.h
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sdotest.h
diff --git a/branches/cpp-M1/sdo/runtime/core/test/sdotest2.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sdotest2.cpp
index 28892994cc..28892994cc 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/sdotest2.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sdotest2.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/test/sequence.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sequence.txt
index 1a616a3d16..1a616a3d16 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/sequence.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/sequence.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/setmany.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/setmany.txt
index 083ebf6b62..083ebf6b62 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/setmany.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/setmany.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/setnull.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/setnull.txt
index f6fe0633e1..f6fe0633e1 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/setnull.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/setnull.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/showdefault1.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/showdefault1.txt
index f49e95dd58..f49e95dd58 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/showdefault1.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/showdefault1.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/showdefault2.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/showdefault2.txt
index a7bd1cba92..a7bd1cba92 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/showdefault2.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/showdefault2.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/simple.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/simple.txt
index 0b143e19a9..0b143e19a9 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/simple.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/simple.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/simple.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/simple.xml
index 4a3c7acce8..4a3c7acce8 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/simple.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/simple.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/simple.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/simple.xsd
index 771ec558fb..771ec558fb 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/simple.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/simple.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/stock.wsdl b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/stock.wsdl
index daa5342656..daa5342656 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/stock.wsdl
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/stock.wsdl
diff --git a/branches/cpp-M1/sdo/runtime/core/test/stock.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/stock.xml
index 28061c84b8..28061c84b8 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/stock.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/stock.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/stock_wsdl.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/stock_wsdl.txt
index 47a11b4d3b..47a11b4d3b 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/stock_wsdl.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/stock_wsdl.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/stock_xml.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/stock_xml.txt
index 6aa493dfa3..6aa493dfa3 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/stock_xml.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/stock_xml.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/t2/include3.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/t2/include3.xsd
index b6ec93f0ba..b6ec93f0ba 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/t2/include3.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/t2/include3.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/t2/includeother.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/t2/includeother.xsd
index fd0b9a61f4..fd0b9a61f4 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/t2/includeother.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/t2/includeother.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/t2/includeother1.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/t2/includeother1.xsd
index 9cbc5d9d27..9cbc5d9d27 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/t2/includeother1.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/t2/includeother1.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/t2/includeother2.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/t2/includeother2.xsd
index 329fd17761..329fd17761 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/t2/includeother2.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/t2/includeother2.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/test/include3.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/test/include3.xsd
index b6ec93f0ba..b6ec93f0ba 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/test/include3.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/test/include3.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/test/includeother.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/test/includeother.xsd
index 5ecbdab1ca..5ecbdab1ca 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/test/includeother.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/test/includeother.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/test/includeother1.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/test/includeother1.xsd
index 9cbc5d9d27..9cbc5d9d27 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/test/includeother1.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/test/includeother1.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/test/includeother2.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/test/includeother2.xsd
index 329fd17761..329fd17761 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/test/includeother2.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/test/includeother2.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/test2/includeother3.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/test2/includeother3.xsd
index b6ec93f0ba..b6ec93f0ba 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/test2/includeother3.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/test2/includeother3.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/testabstract.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testabstract.txt
index 80c1d03afe..80c1d03afe 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/testabstract.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testabstract.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/testerrors.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testerrors.txt
index 6cfce57b31..6cfce57b31 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/testerrors.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testerrors.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/testinc2.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testinc2.txt
index 837559562e..837559562e 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/testinc2.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testinc2.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/testopen.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testopen.txt
index 7d7b816e6d..7d7b816e6d 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/testopen.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testopen.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/testopen3.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testopen3.xml
index 57dfb96ec4..57dfb96ec4 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/testopen3.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testopen3.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/testorder.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testorder.txt
index 4f46cbfecf..4f46cbfecf 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/testorder.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testorder.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/teststyles.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/teststyles.txt
index 52de3ffc6a..52de3ffc6a 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/teststyles.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/teststyles.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/testsubsload.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testsubsload.txt
index 43c16114c3..43c16114c3 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/testsubsload.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testsubsload.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/testutils.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testutils.txt
index dd86813b90..dd86813b90 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/testutils.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testutils.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/testwsdl.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testwsdl.txt
index 025b797d96..025b797d96 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/testwsdl.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testwsdl.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/testwsdl.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testwsdl.xml
index 5fe93371ca..5fe93371ca 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/testwsdl.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/testwsdl.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/travel.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/travel.txt
index 5311a919f8..5311a919f8 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/travel.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/travel.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/userdata.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/userdata.txt
index e24caba194..e24caba194 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/userdata.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/userdata.txt
diff --git a/branches/cpp-M1/sdo/runtime/core/test/utils.cpp b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/utils.cpp
index 4b13998c6b..4b13998c6b 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/utils.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/utils.cpp
diff --git a/branches/cpp-M1/sdo/runtime/core/test/xhtml1.xsd b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/xhtml1.xsd
index 54d78e0366..54d78e0366 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/xhtml1.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/xhtml1.xsd
diff --git a/branches/cpp-M1/sdo/runtime/core/test/xhtml_in.xml b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/xhtml_in.xml
index 73e91260a8..73e91260a8 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/xhtml_in.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/xhtml_in.xml
diff --git a/branches/cpp-M1/sdo/runtime/core/test/xhtml_out.txt b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/xhtml_out.txt
index d485768c7e..d485768c7e 100644
--- a/branches/cpp-M1/sdo/runtime/core/test/xhtml_out.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/runtime/core/test/xhtml_out.txt
diff --git a/branches/cpp-M1/sdo/samples/AUTHORS b/sca-cpp/branches/cpp-M1/sdo/samples/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/branches/cpp-M1/sdo/samples/AUTHORS
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/AUTHORS
diff --git a/branches/cpp-M1/sdo/samples/COPYING b/sca-cpp/branches/cpp-M1/sdo/samples/COPYING
index 6b0b1270ff..6b0b1270ff 100755
--- a/branches/cpp-M1/sdo/samples/COPYING
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/COPYING
diff --git a/branches/cpp-M1/sdo/samples/ChangeLog b/sca-cpp/branches/cpp-M1/sdo/samples/ChangeLog
index e69de29bb2..e69de29bb2 100644
--- a/branches/cpp-M1/sdo/samples/ChangeLog
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/ChangeLog
diff --git a/branches/cpp-M1/sdo/samples/GettingStarted.html b/sca-cpp/branches/cpp-M1/sdo/samples/GettingStarted.html
index df5fa3ffb1..df5fa3ffb1 100644
--- a/branches/cpp-M1/sdo/samples/GettingStarted.html
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/GettingStarted.html
diff --git a/branches/cpp-M1/sdo/samples/INSTALL b/sca-cpp/branches/cpp-M1/sdo/samples/INSTALL
index e69de29bb2..e69de29bb2 100644
--- a/branches/cpp-M1/sdo/samples/INSTALL
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/INSTALL
diff --git a/branches/cpp-M1/sdo/samples/LICENSE b/sca-cpp/branches/cpp-M1/sdo/samples/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/branches/cpp-M1/sdo/samples/LICENSE
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/LICENSE
diff --git a/branches/cpp-M1/sdo/samples/Makefile.am b/sca-cpp/branches/cpp-M1/sdo/samples/Makefile.am
index 68251b1e10..68251b1e10 100644
--- a/branches/cpp-M1/sdo/samples/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/Makefile.am
diff --git a/branches/cpp-M1/sdo/samples/NEWS b/sca-cpp/branches/cpp-M1/sdo/samples/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/branches/cpp-M1/sdo/samples/NEWS
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/NEWS
diff --git a/branches/cpp-M1/sdo/samples/NOTICE b/sca-cpp/branches/cpp-M1/sdo/samples/NOTICE
index bfb81409ad..bfb81409ad 100644
--- a/branches/cpp-M1/sdo/samples/NOTICE
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/NOTICE
diff --git a/branches/cpp-M1/sdo/samples/README b/sca-cpp/branches/cpp-M1/sdo/samples/README
index e69de29bb2..e69de29bb2 100644
--- a/branches/cpp-M1/sdo/samples/README
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/README
diff --git a/branches/cpp-M1/sdo/samples/autogen.sh b/sca-cpp/branches/cpp-M1/sdo/samples/autogen.sh
index 3cebb0a380..3cebb0a380 100755
--- a/branches/cpp-M1/sdo/samples/autogen.sh
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/autogen.sh
diff --git a/branches/cpp-M1/sdo/samples/build.sh b/sca-cpp/branches/cpp-M1/sdo/samples/build.sh
index adfc9e6ae9..adfc9e6ae9 100755
--- a/branches/cpp-M1/sdo/samples/build.sh
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/build.sh
diff --git a/branches/cpp-M1/sdo/samples/configure.ac b/sca-cpp/branches/cpp-M1/sdo/samples/configure.ac
index 6fb77f3dd3..6fb77f3dd3 100644
--- a/branches/cpp-M1/sdo/samples/configure.ac
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/configure.ac
diff --git a/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/build.cmd b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/build.cmd
index c43c1b17ef..c43c1b17ef 100644
--- a/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/build.cmd
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/build.cmd
diff --git a/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/misc.dsw b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/misc.dsw
index 816b3b2f93..816b3b2f93 100644
--- a/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/misc.dsw
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/misc.dsw
diff --git a/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/misc.ncb b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/misc.ncb
index e05deb80a8..e05deb80a8 100644
--- a/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/misc.ncb
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/misc.ncb
diff --git a/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/misc.opt b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/misc.opt
index 8e3cd5168a..8e3cd5168a 100644
--- a/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/misc.opt
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/misc.opt
diff --git a/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/BuildInstructions.txt b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/BuildInstructions.txt
index e69de29bb2..e69de29bb2 100644
--- a/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/BuildInstructions.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/BuildInstructions.txt
diff --git a/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/sdo_misc.dsp b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/sdo_misc.dsp
index ad3c9daae4..ad3c9daae4 100644
--- a/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/sdo_misc.dsp
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/sdo_misc.dsp
diff --git a/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/sdo_misc.mak b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/sdo_misc.mak
index 2b382d844a..2b382d844a 100644
--- a/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/sdo_misc.mak
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio6/projects/misc/sdo_misc/sdo_misc.mak
diff --git a/branches/cpp-M1/sdo/samples/ides/devstudio7/projects/misc/misc.sln b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio7/projects/misc/misc.sln
index e17079e801..e17079e801 100644
--- a/branches/cpp-M1/sdo/samples/ides/devstudio7/projects/misc/misc.sln
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio7/projects/misc/misc.sln
diff --git a/branches/cpp-M1/sdo/samples/ides/devstudio7/projects/misc/misc.suo b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio7/projects/misc/misc.suo
index d31a854277..d31a854277 100644
--- a/branches/cpp-M1/sdo/samples/ides/devstudio7/projects/misc/misc.suo
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio7/projects/misc/misc.suo
diff --git a/branches/cpp-M1/sdo/samples/ides/devstudio7/projects/misc/sdo_misc/BuildInstructions.txt b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio7/projects/misc/sdo_misc/BuildInstructions.txt
index e69de29bb2..e69de29bb2 100644
--- a/branches/cpp-M1/sdo/samples/ides/devstudio7/projects/misc/sdo_misc/BuildInstructions.txt
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio7/projects/misc/sdo_misc/BuildInstructions.txt
diff --git a/branches/cpp-M1/sdo/samples/ides/devstudio7/projects/misc/sdo_misc/sdo_misc.vcproj b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio7/projects/misc/sdo_misc/sdo_misc.vcproj
index faf875dabd..faf875dabd 100644
--- a/branches/cpp-M1/sdo/samples/ides/devstudio7/projects/misc/sdo_misc/sdo_misc.vcproj
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/ides/devstudio7/projects/misc/sdo_misc/sdo_misc.vcproj
diff --git a/branches/cpp-M1/sdo/samples/misc/ChangeSummarySave.cpp b/sca-cpp/branches/cpp-M1/sdo/samples/misc/ChangeSummarySave.cpp
index 5d65ec1009..5d65ec1009 100644
--- a/branches/cpp-M1/sdo/samples/misc/ChangeSummarySave.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/misc/ChangeSummarySave.cpp
diff --git a/branches/cpp-M1/sdo/samples/misc/ChangeSummarySave.xsd b/sca-cpp/branches/cpp-M1/sdo/samples/misc/ChangeSummarySave.xsd
index 2c7769167a..2c7769167a 100644
--- a/branches/cpp-M1/sdo/samples/misc/ChangeSummarySave.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/misc/ChangeSummarySave.xsd
diff --git a/branches/cpp-M1/sdo/samples/misc/Makefile.am b/sca-cpp/branches/cpp-M1/sdo/samples/misc/Makefile.am
index 07107de2c8..07107de2c8 100644
--- a/branches/cpp-M1/sdo/samples/misc/Makefile.am
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/misc/Makefile.am
diff --git a/branches/cpp-M1/sdo/samples/misc/ObjectCreation.cpp b/sca-cpp/branches/cpp-M1/sdo/samples/misc/ObjectCreation.cpp
index 7f570efb76..7f570efb76 100644
--- a/branches/cpp-M1/sdo/samples/misc/ObjectCreation.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/misc/ObjectCreation.cpp
diff --git a/branches/cpp-M1/sdo/samples/misc/Query.cpp b/sca-cpp/branches/cpp-M1/sdo/samples/misc/Query.cpp
index d86b896679..d86b896679 100644
--- a/branches/cpp-M1/sdo/samples/misc/Query.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/misc/Query.cpp
diff --git a/branches/cpp-M1/sdo/samples/misc/Substitutes.cpp b/sca-cpp/branches/cpp-M1/sdo/samples/misc/Substitutes.cpp
index 826e7f8aee..826e7f8aee 100644
--- a/branches/cpp-M1/sdo/samples/misc/Substitutes.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/misc/Substitutes.cpp
diff --git a/branches/cpp-M1/sdo/samples/misc/XSDLoading.cpp b/sca-cpp/branches/cpp-M1/sdo/samples/misc/XSDLoading.cpp
index f1997d31bf..f1997d31bf 100644
--- a/branches/cpp-M1/sdo/samples/misc/XSDLoading.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/misc/XSDLoading.cpp
diff --git a/branches/cpp-M1/sdo/samples/misc/XSDLoading.xml b/sca-cpp/branches/cpp-M1/sdo/samples/misc/XSDLoading.xml
index 6253ca34fd..6253ca34fd 100644
--- a/branches/cpp-M1/sdo/samples/misc/XSDLoading.xml
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/misc/XSDLoading.xml
diff --git a/branches/cpp-M1/sdo/samples/misc/XSDLoading.xsd b/sca-cpp/branches/cpp-M1/sdo/samples/misc/XSDLoading.xsd
index 808e075a2d..808e075a2d 100644
--- a/branches/cpp-M1/sdo/samples/misc/XSDLoading.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/misc/XSDLoading.xsd
diff --git a/branches/cpp-M1/sdo/samples/misc/companysubs.xsd b/sca-cpp/branches/cpp-M1/sdo/samples/misc/companysubs.xsd
index 124960676b..124960676b 100644
--- a/branches/cpp-M1/sdo/samples/misc/companysubs.xsd
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/misc/companysubs.xsd
diff --git a/branches/cpp-M1/sdo/samples/misc/samples.cpp b/sca-cpp/branches/cpp-M1/sdo/samples/misc/samples.cpp
index 1841d4f845..1841d4f845 100644
--- a/branches/cpp-M1/sdo/samples/misc/samples.cpp
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/misc/samples.cpp
diff --git a/branches/cpp-M1/sdo/samples/misc/samples.h b/sca-cpp/branches/cpp-M1/sdo/samples/misc/samples.h
index 4d2ddfde79..4d2ddfde79 100644
--- a/branches/cpp-M1/sdo/samples/misc/samples.h
+++ b/sca-cpp/branches/cpp-M1/sdo/samples/misc/samples.h
diff --git a/branches/cpp-M1/sdo/sdotest.bat b/sca-cpp/branches/cpp-M1/sdo/sdotest.bat
index d2f54c6351..d2f54c6351 100644
--- a/branches/cpp-M1/sdo/sdotest.bat
+++ b/sca-cpp/branches/cpp-M1/sdo/sdotest.bat
diff --git a/branches/cpp-M1/sdo/sdotest.sh b/sca-cpp/branches/cpp-M1/sdo/sdotest.sh
index 8e2dd108ce..8e2dd108ce 100755
--- a/branches/cpp-M1/sdo/sdotest.sh
+++ b/sca-cpp/branches/cpp-M1/sdo/sdotest.sh