155 files changed, 0 insertions, 0 deletions

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