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

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

264 files changed, 0 insertions, 0 deletions

diff --git a/tags/cpp-sca-20060405/tools/scagen/build.xml b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/build.xml
index 5207b6cc79..5207b6cc79 100644
--- a/tags/cpp-sca-20060405/tools/scagen/build.xml
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/build.xml
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/allclasses-frame.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/allclasses-frame.html
index 1eb0408cef..1eb0408cef 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/allclasses-frame.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/allclasses-frame.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/allclasses-noframe.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/allclasses-noframe.html
index fdbfa13e1c..fdbfa13e1c 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/allclasses-noframe.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/allclasses-noframe.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/constant-values.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/constant-values.html
index e9b450cd20..e9b450cd20 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/constant-values.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/constant-values.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/deprecated-list.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/deprecated-list.html
index 9063a7fff9..9063a7fff9 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/deprecated-list.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/deprecated-list.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/help-doc.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/help-doc.html
index 5a4302b221..5a4302b221 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/help-doc.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/help-doc.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/index-all.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/index-all.html
index dab7cf9cd3..dab7cf9cd3 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/index-all.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/index-all.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/index.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/index.html
index 6595eb4eac..6595eb4eac 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/index.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/index.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/BodyPart.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/BodyPart.html
index 88b29695e0..88b29695e0 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/BodyPart.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/BodyPart.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.html
index f688955d94..f688955d94 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Configuration.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Configuration.html
index 5fa0f3af67..5fa0f3af67 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Configuration.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Configuration.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.html
index 88913b0dc8..88913b0dc8 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/FileActor.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/FileActor.html
index adc1ec6aab..adc1ec6aab 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/FileActor.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/FileActor.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/FilePart.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/FilePart.html
index c5e0c1da1c..c5e0c1da1c 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/FilePart.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/FilePart.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Headers.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Headers.html
index 3d08c1df43..3d08c1df43 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Headers.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Headers.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.html
index 0d48df2ac7..0d48df2ac7 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/MethodPart.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/MethodPart.html
index 591a36b08c..591a36b08c 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/MethodPart.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/MethodPart.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Options.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Options.html
index 57c1e42dab..57c1e42dab 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Options.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Options.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Parameter.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Parameter.html
index e61c2ae9ae..e61c2ae9ae 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Parameter.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Parameter.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/ParsingException.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/ParsingException.html
index 29585ad7ee..29585ad7ee 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/ParsingException.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/ParsingException.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.html
index bfd601d5b3..bfd601d5b3 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Signature.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Signature.html
index 2a2eef3678..2a2eef3678 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Signature.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Signature.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Utils.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Utils.html
index 8571178678..8571178678 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Utils.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/Utils.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/BodyPart.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/BodyPart.html
index 109d6c539a..109d6c539a 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/BodyPart.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/BodyPart.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/CParsingTool.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/CParsingTool.html
index 36cb776f02..36cb776f02 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/CParsingTool.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/CParsingTool.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Configuration.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Configuration.html
index bb2432666e..bb2432666e 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Configuration.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Configuration.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/DirectoryTree.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/DirectoryTree.html
index 4140168273..4140168273 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/DirectoryTree.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/DirectoryTree.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/FileActor.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/FileActor.html
index 3ab90283bd..3ab90283bd 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/FileActor.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/FileActor.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/FilePart.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/FilePart.html
index aa4796486e..aa4796486e 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/FilePart.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/FilePart.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Headers.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Headers.html
index 60190bbada..60190bbada 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Headers.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Headers.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/InputCppSourceCode.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/InputCppSourceCode.html
index 463968468c..463968468c 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/InputCppSourceCode.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/InputCppSourceCode.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/MethodPart.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/MethodPart.html
index 19b474a7e7..19b474a7e7 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/MethodPart.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/MethodPart.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Options.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Options.html
index 040187072f..040187072f 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Options.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Options.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Parameter.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Parameter.html
index a91a2c687b..a91a2c687b 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Parameter.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Parameter.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/ParsingException.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/ParsingException.html
index dedd25a4f2..dedd25a4f2 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/ParsingException.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/ParsingException.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/PrototypePart.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/PrototypePart.html
index 22c4575fab..22c4575fab 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/PrototypePart.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/PrototypePart.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Signature.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Signature.html
index 228807ba8a..228807ba8a 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Signature.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Signature.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Utils.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Utils.html
index cd93afeeb6..cd93afeeb6 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Utils.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/class-use/Utils.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/package-frame.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/package-frame.html
index 2e0e528f32..2e0e528f32 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/package-frame.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/package-frame.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/package-summary.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/package-summary.html
index 3fa24db0cd..3fa24db0cd 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/package-summary.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/package-summary.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/package-tree.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/package-tree.html
index d6ca34c836..d6ca34c836 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/package-tree.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/package-tree.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/package-use.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/package-use.html
index 36fda7a829..36fda7a829 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/package-use.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/common/package-use.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.html
index 84b07c500a..84b07c500a 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.html
index 666f530637..666f530637 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.html
index c7c82a3cc0..c7c82a3cc0 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/DomHandler.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/DomHandler.html
index cf6f2e436c..cf6f2e436c 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/DomHandler.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/DomHandler.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.html
index b62f5a4694..b62f5a4694 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.html
index 2a7a65c242..2a7a65c242 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/LittleClass.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/LittleClass.html
index 3562f99e07..3562f99e07 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/LittleClass.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/LittleClass.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ModuleOrFragmentFileHandler.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ModuleOrFragmentFileHandler.html
index 71448f7f04..71448f7f04 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ModuleOrFragmentFileHandler.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ModuleOrFragmentFileHandler.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.html
index 506b804627..506b804627 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/Scagen.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/Scagen.html
index 08c200c9e8..08c200c9e8 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/Scagen.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/Scagen.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.html
index 5970989783..5970989783 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.html
index ebf2ec4ac5..ebf2ec4ac5 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.html
index 67930e3ba8..67930e3ba8 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ComponentDomNodeHandler.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ComponentDomNodeHandler.html
index 5b92855433..5b92855433 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ComponentDomNodeHandler.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ComponentDomNodeHandler.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ComponentTypeFileHandler.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ComponentTypeFileHandler.html
index 5b7fe28bdb..5b7fe28bdb 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ComponentTypeFileHandler.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ComponentTypeFileHandler.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/DirectoryScanner.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/DirectoryScanner.html
index 2b9b52e3bc..2b9b52e3bc 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/DirectoryScanner.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/DirectoryScanner.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/DomHandler.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/DomHandler.html
index 000ac87acc..000ac87acc 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/DomHandler.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/DomHandler.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/DomNodeHandler.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/DomNodeHandler.html
index ed14ed35cd..ed14ed35cd 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/DomNodeHandler.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/DomNodeHandler.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/GenericDomNodeHandler.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/GenericDomNodeHandler.html
index b35bfde41f..b35bfde41f 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/GenericDomNodeHandler.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/GenericDomNodeHandler.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/LittleClass.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/LittleClass.html
index a7597e3212..a7597e3212 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/LittleClass.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/LittleClass.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ModuleOrFragmentFileHandler.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ModuleOrFragmentFileHandler.html
index 4115066abd..4115066abd 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ModuleOrFragmentFileHandler.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ModuleOrFragmentFileHandler.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ReferenceDomNodeHandler.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ReferenceDomNodeHandler.html
index b86f9da242..b86f9da242 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ReferenceDomNodeHandler.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ReferenceDomNodeHandler.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/Scagen.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/Scagen.html
index 2a212df7cf..2a212df7cf 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/Scagen.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/Scagen.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ServiceDomNodeHandler.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ServiceDomNodeHandler.html
index 630cee5ec6..630cee5ec6 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ServiceDomNodeHandler.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ServiceDomNodeHandler.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ServicesGenerator.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ServicesGenerator.html
index ecf5d60367..ecf5d60367 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ServicesGenerator.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/ServicesGenerator.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/XMLFileActor.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/XMLFileActor.html
index 4749bbd440..4749bbd440 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/XMLFileActor.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/class-use/XMLFileActor.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/package-frame.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/package-frame.html
index 67936195cb..67936195cb 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/package-frame.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/package-frame.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/package-summary.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/package-summary.html
index 7d4ef0c594..7d4ef0c594 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/package-summary.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/package-summary.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/package-tree.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/package-tree.html
index adceb9d363..adceb9d363 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/package-tree.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/package-tree.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/package-use.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/package-use.html
index f35093ab2a..f35093ab2a 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/package-use.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/org/apache/tuscany/sca/cpp/tools/services/package-use.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/overview-frame.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/overview-frame.html
index ac9bf75355..ac9bf75355 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/overview-frame.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/overview-frame.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/overview-summary.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/overview-summary.html
index 8d79e7de28..8d79e7de28 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/overview-summary.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/overview-summary.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/overview-tree.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/overview-tree.html
index 0c3da7e516..0c3da7e516 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/overview-tree.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/overview-tree.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/package-list b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/package-list
index 2d78f0b38b..2d78f0b38b 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/package-list
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/package-list
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/packages.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/packages.html
index 5657522fec..5657522fec 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/packages.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/packages.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/resources/inherit.gif b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/resources/inherit.gif
index c814867a13..c814867a13 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/resources/inherit.gif
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/resources/inherit.gif
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/serialized-form.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/serialized-form.html
index 75a28975e2..75a28975e2 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/serialized-form.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/serialized-form.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/docs/api/stylesheet.css b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/stylesheet.css
index 6d31fdbc7f..6d31fdbc7f 100644
--- a/tags/cpp-sca-20060405/tools/scagen/docs/api/stylesheet.css
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/docs/api/stylesheet.css
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java
index 448fd6dd7d..448fd6dd7d 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/CalculatorTest.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
index 2f1bf78921..2f1bf78921 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/EnvHandlerTest.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
index 1dfe302cf1..1dfe302cf1 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/ImplClassWithNameSpaceTest.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
index 146c18fa1b..146c18fa1b 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceButNotInClassAttrTest.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
index c78f8a5f93..c78f8a5f93 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/IntfClassWithNameSpaceTest.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingModuleAndFragmentTest.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingModuleAndFragmentTest.java
index 4a8f8449a6..4a8f8449a6 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingModuleAndFragmentTest.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/MissingModuleAndFragmentTest.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
index 9c05599286..9c05599286 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/SimplePublicPrivateProtectedTest.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllModulesTest.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllModulesTest.java
index fc5c8c5653..fc5c8c5653 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllModulesTest.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestAllModulesTest.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
index fb4cd4b606..fb4cd4b606 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TestDeployAssistTool.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
index 00f6868ce6..00f6868ce6 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/org/apache/tuscany/sca/cpp/tools/junit/TuscanyTestCase.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/go.cmd b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/go.cmd
index 6a303b1471..6a303b1471 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/go.cmd
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/go.cmd
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/go_no_dir_option.cmd b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/go_no_dir_option.cmd
index 13834b3aae..13834b3aae 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/go_no_dir_option.cmd
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/go_no_dir_option.cmd
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/go_no_input_dir.cmd b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/go_no_input_dir.cmd
index 4fa9a86b1f..4fa9a86b1f 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/go_no_input_dir.cmd
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/go_no_input_dir.cmd
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/go_no_output_dir.cmd b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/go_no_output_dir.cmd
index 5e6b818ae3..5e6b818ae3 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/go_no_output_dir.cmd
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/go_no_output_dir.cmd
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/refresh-tools-jar.cmd b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/refresh-tools-jar.cmd
index 2640ed87de..2640ed87de 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/refresh-tools-jar.cmd
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/scripts_for_standalone_testing/refresh-tools-jar.cmd
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/Calculator.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/Calculator.h
index 3ab503ef1d..3ab503ef1d 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/Calculator.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/Calculator.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/CalculatorImpl.componentType b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/CalculatorImpl.componentType
index ef0f346ba0..ef0f346ba0 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/CalculatorImpl.componentType
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/CalculatorImpl.componentType
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/CalculatorImpl.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/CalculatorImpl.h
index daa9b25627..daa9b25627 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/CalculatorImpl.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/CalculatorImpl.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/sca.module b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/sca.module
index f74d5f690c..f74d5f690c 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/sca.module
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorModuleAndComponent/sca.module
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h
index da74be77a6..da74be77a6 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/otherSubFolder/CalculatorBack.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h
index 48a5ff5018..48a5ff5018 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/otherSubFolder/CalculatorForward.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/sca.module b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/sca.module
index b4aaa37a4c..b4aaa37a4c 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/sca.module
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/sca.module
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType
index 6a5a152266..6a5a152266 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.componentType
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h
index 0cacc5916c..0cacc5916c 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorBackImpl.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType
index 9617b22aee..9617b22aee 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.componentType
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h
index f3b0467002..f3b0467002 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CalculatorSlashDirectionTest/subFolder/CalculatorForwardImpl.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment
index 29fd03c399..29fd03c399 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.fragment
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h
index d5e1a702c6..d5e1a702c6 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfo.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType
index d39a3bdadf..d39a3bdadf 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.componentType
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h
index 546df093a3..546df093a3 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplMultiParamDiffTypesTest/CustomerInfoImpl.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment
index fa6d101363..fa6d101363 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.fragment
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h
index d3be176bfd..d3be176bfd 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfo.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType
index d39a3bdadf..d39a3bdadf 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.componentType
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h
index 50d37ee4f2..50d37ee4f2 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/CustomerInfoImplSingleParamDiffTypesTest/CustomerInfoImpl.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfo.fragment b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfo.fragment
index 491e79f5e4..491e79f5e4 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfo.fragment
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfo.fragment
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfo.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfo.h
index 7bd355b3ab..7bd355b3ab 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfo.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfo.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfoImpl.componentType b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfoImpl.componentType
index 179af71dca..179af71dca 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfoImpl.componentType
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfoImpl.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfoImpl.h
index 85e96bb348..85e96bb348 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfoImpl.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/CustomerInfoImpl.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValue.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValue.h
index a65b1f944c..a65b1f944c 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValue.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValue.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl.componentType b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl.componentType
index df0d97a438..df0d97a438 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl.componentType
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl.componentType
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl.hpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl.hpp
index f7a8171a65..f7a8171a65 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl.hpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl.hpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl_stockQuote_Proxy.h
index 5c8293b51e..5c8293b51e 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/StockQuoteService.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/StockQuoteService.h
index d96115fb3f..d96115fb3f 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/StockQuoteService.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/StockQuoteService.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/sca.module b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/sca.module
index 565f4a74ec..565f4a74ec 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/sca.module
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModule/sca.module
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfo.fragment b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfo.fragment
index 5666c51a41..5666c51a41 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfo.fragment
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfo.fragment
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfo.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfo.h
index e41f9e8287..e41f9e8287 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfo.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfo.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfoImpl.componentType b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfoImpl.componentType
index 179af71dca..179af71dca 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfoImpl.componentType
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfoImpl.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfoImpl.h
index b1360c5994..b1360c5994 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfoImpl.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/CustomerInfoImpl.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValue.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValue.h
index 8b921bc2bf..8b921bc2bf 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValue.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValue.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl.componentType b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl.componentType
index df0d97a438..df0d97a438 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl.componentType
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl.componentType
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl.hpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl.hpp
index f7a8171a65..f7a8171a65 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl.hpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl.hpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h
index 5c8293b51e..5c8293b51e 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/StockQuoteService.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/StockQuoteService.h
index 919b514e1a..919b514e1a 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/StockQuoteService.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/StockQuoteService.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/sca.module b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/sca.module
index 565f4a74ec..565f4a74ec 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/sca.module
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleImplClassWithNamespace/sca.module
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValue.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValue.h
index 503f771bb2..503f771bb2 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValue.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValue.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValueImpl.componentType b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValueImpl.componentType
index 8673c813a6..8673c813a6 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValueImpl.componentType
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValueImpl.componentType
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValueImpl.hpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValueImpl.hpp
index f7a8171a65..f7a8171a65 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValueImpl.hpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/MyValueImpl.hpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/sca.module b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/sca.module
index 6572621f1d..6572621f1d 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/sca.module
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespace/sca.module
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValue.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValue.h
index ea8ebbb792..ea8ebbb792 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValue.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValue.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
index c8d68fba5a..c8d68fba5a 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.componentType
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
index f7a8171a65..f7a8171a65 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/MyValueImpl.hpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/sca.module b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/sca.module
index 6572621f1d..6572621f1d 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/sca.module
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/sca.module
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleMissingScaModule/CustomerInfo.fragmentX b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleMissingScaModule/CustomerInfo.fragmentX
index 10c1805244..10c1805244 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleMissingScaModule/CustomerInfo.fragmentX
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleMissingScaModule/CustomerInfo.fragmentX
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleMissingScaModule/sca.moduleX b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleMissingScaModule/sca.moduleX
index 3eea80439f..3eea80439f 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleMissingScaModule/sca.moduleX
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleMissingScaModule/sca.moduleX
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfo.fragment b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfo.fragment
index 491e79f5e4..491e79f5e4 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfo.fragment
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfo.fragment
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfo.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfo.h
index 7bd355b3ab..7bd355b3ab 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfo.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfo.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfoImpl.componentType b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfoImpl.componentType
index 179af71dca..179af71dca 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfoImpl.componentType
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfoImpl.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfoImpl.h
index e247a9b0bb..e247a9b0bb 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfoImpl.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/CustomerInfoImpl.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValue.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValue.h
index a65b1f944c..a65b1f944c 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValue.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValue.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl.componentType b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl.componentType
index df0d97a438..df0d97a438 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl.componentType
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl.componentType
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl.hpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl.hpp
index f7a8171a65..f7a8171a65 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl.hpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl.hpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl_stockQuote_Proxy.h
index 5c8293b51e..5c8293b51e 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/StockQuoteService.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/StockQuoteService.h
index 919b514e1a..919b514e1a 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/StockQuoteService.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/StockQuoteService.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/sca.module b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/sca.module
index 565f4a74ec..565f4a74ec 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/sca.module
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/MyValueServiceModuleTwoClasses/sca.module
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfo.fragment b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfo.fragment
index 687162ec2a..687162ec2a 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfo.fragment
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfo.fragment
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfo.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfo.h
index b944d161eb..b944d161eb 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfo.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfo.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType
index 179af71dca..179af71dca 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfoImpl.componentType
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h
index 87cac61085..87cac61085 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testinput/modules/SimplePublicPrivateProtectedTest/CustomerInfoImpl.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
index 04980879e3..04980879e3 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
index 748c493865..748c493865 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
index c174fb3a47..c174fb3a47 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
index 8856c7786c..8856c7786c 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorModuleAndComponent/expected_output/CalculatorImpl_CalculatorService_Wrapper.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
index ded3e76eb0..ded3e76eb0 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
index 2a2474aad1..2a2474aad1 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
index b9a7f0a69a..b9a7f0a69a 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
index da132b9e34..da132b9e34 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorBackImpl_CalculatorService_Wrapper.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
index 77c6b7e29b..77c6b7e29b 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
index 8714cddb83..8714cddb83 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
index 019cf00ca8..019cf00ca8 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
index 3ab3fd9a7d..3ab3fd9a7d 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CalculatorSlashDirectionTest/expected_output/CalculatorForwardImpl_CalculatorService_Wrapper.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index 9087c58b0f..9087c58b0f 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index 47b604358a..47b604358a 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index 51c975ec9b..51c975ec9b 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 778a168220..778a168220 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplMultiParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index a033e9b11e..a033e9b11e 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index f10da9c15e..f10da9c15e 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index abf2b8ed1a..abf2b8ed1a 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 778a168220..778a168220 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/CustomerInfoImplSingleParamDiffTypesTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
index e1950f17a6..e1950f17a6 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
index 03fe3e3b93..03fe3e3b93 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
index 2d5f502b08..2d5f502b08 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
index 7f7cb13a6b..7f7cb13a6b 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index c83eb661ca..c83eb661ca 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.h
index 38f22384b0..38f22384b0 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index d9337c9341..d9337c9341 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.h
index 2f5da06e30..2f5da06e30 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.cpp
index 7625556203..7625556203 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.h
index cc60ef5005..cc60ef5005 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_customerInfo_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.cpp
index 14b37fa4bd..14b37fa4bd 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.h
index 850bc3861c..850bc3861c 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModule/expected_output/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index aaf2115547..aaf2115547 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index 3739cd72d1..3739cd72d1 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index d1fb6073c9..d1fb6073c9 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 778a168220..778a168220 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index c83eb661ca..c83eb661ca 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
index 38f22384b0..38f22384b0 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index d9337c9341..d9337c9341 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
index 2f5da06e30..2f5da06e30 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
index 7625556203..7625556203 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
index cc60ef5005..cc60ef5005 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_customerInfo_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
index 14b37fa4bd..14b37fa4bd 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
index 850bc3861c..850bc3861c 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleImplClassWithNamespace/expected_output/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index 5e5a85a7c5..5e5a85a7c5 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
index 19f4e9c89a..19f4e9c89a 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index 7a5e40e9ea..7a5e40e9ea 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
index 2f5da06e30..2f5da06e30 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespace/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index 5e5a85a7c5..5e5a85a7c5 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
index 19f4e9c89a..19f4e9c89a 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index 7a5e40e9ea..7a5e40e9ea 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
index 2f5da06e30..2f5da06e30 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleIntfClassWithNamespaceButNotInClassAttr/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
index e1950f17a6..e1950f17a6 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
index 03fe3e3b93..03fe3e3b93 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
index 2d5f502b08..2d5f502b08 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
index 7f7cb13a6b..7f7cb13a6b 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/CustomerInfoImpl2_CustomerInfoService_Wrapper.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
index c83eb661ca..c83eb661ca 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
index 38f22384b0..38f22384b0 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
index d9337c9341..d9337c9341 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
index 2f5da06e30..2f5da06e30 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_MyValueService_Wrapper.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
index 7625556203..7625556203 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
index cc60ef5005..cc60ef5005 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_customerInfo_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
index 14b37fa4bd..14b37fa4bd 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
index 850bc3861c..850bc3861c 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/MyValueServiceModuleTwoClasses/expected_output/MyValueImpl_stockQuote_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
index fae8534537..fae8534537 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
index ea4c69e376..ea4c69e376 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Proxy.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
index 70a1e8cbd1..70a1e8cbd1 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.cpp
diff --git a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
index 778a168220..778a168220 100644
--- a/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/junit/testoutput/SimplePublicPrivateProtectedTest/expected_output/CustomerInfoImpl_CustomerInfoService_Wrapper.h
diff --git a/tags/cpp-sca-20060405/tools/scagen/lib/readme.txt b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/lib/readme.txt
index d99c666c6a..d99c666c6a 100644
--- a/tags/cpp-sca-20060405/tools/scagen/lib/readme.txt
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/lib/readme.txt
diff --git a/tags/cpp-sca-20060405/tools/scagen/scagen.cmd b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/scagen.cmd
index b222ce2f9f..b222ce2f9f 100644
--- a/tags/cpp-sca-20060405/tools/scagen/scagen.cmd
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/scagen.cmd
diff --git a/tags/cpp-sca-20060405/tools/scagen/scagen.sh b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/scagen.sh
index 23d6dedc47..23d6dedc47 100755
--- a/tags/cpp-sca-20060405/tools/scagen/scagen.sh
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/scagen.sh
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java
index 65b1e2f6fa..65b1e2f6fa 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/BodyPart.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java
index 6846bb4096..6846bb4096 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/CParsingTool.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java
index 1a900ff711..1a900ff711 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Configuration.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java
index a4f1ca9a21..a4f1ca9a21 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/DirectoryTree.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java
index fc1c8ec5c3..fc1c8ec5c3 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FileActor.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java
index e629751ea4..e629751ea4 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/FilePart.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java
index 8deba2401d..8deba2401d 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Headers.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java
index ae6a646eaf..ae6a646eaf 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/InputCppSourceCode.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java
index 813de0ff56..813de0ff56 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MacroPart.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java
index facebe84ef..facebe84ef 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/MethodPart.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java
index dc9d941849..dc9d941849 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Options.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java
index 3f4b3e971e..3f4b3e971e 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Parameter.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java
index 3f140c0f9f..3f140c0f9f 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/ParsingException.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java
index 64ed2e9542..64ed2e9542 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/PrototypePart.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java
index 3650839cab..3650839cab 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Signature.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java
index 5bd80fc37a..5bd80fc37a 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/Utils.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html
index c86184f441..c86184f441 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/common/package.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
index ea27e33d09..ea27e33d09 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentDomNodeHandler.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java
index 0ee9b97138..0ee9b97138 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ComponentTypeFileHandler.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java
index 1ff4504fff..1ff4504fff 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DirectoryScanner.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java
index 2ca4c7c881..2ca4c7c881 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomHandler.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java
index 00942bd9ca..00942bd9ca 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/DomNodeHandler.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java
index 3f9fb359f5..3f9fb359f5 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/GenericDomNodeHandler.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java
index 699abf7a08..699abf7a08 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/LittleClass.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ModuleOrFragmentFileHandler.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ModuleOrFragmentFileHandler.java
index 3bd8129401..3bd8129401 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ModuleOrFragmentFileHandler.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ModuleOrFragmentFileHandler.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
index a490d184d1..a490d184d1 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ReferenceDomNodeHandler.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java
index a6f6f58644..a6f6f58644 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/Scagen.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
index 79b74c0450..79b74c0450 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServiceDomNodeHandler.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
index 6442b76992..6442b76992 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/ServicesGenerator.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java
index 047e1ab3f1..047e1ab3f1 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/XMLFileActor.java
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html
index 316e4cd56e..316e4cd56e 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/package.html
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl
index bc98f3a970..bc98f3a970 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyCPP.xsl
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl
index 3df2f83d53..3df2f83d53 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfProxyHeader.xsl
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
index 912df6cf03..912df6cf03 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperCPP.xsl
diff --git a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl
index 72dc1fc5a6..72dc1fc5a6 100644
--- a/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl
+++ b/sca-cpp/tags/cpp-sca-20060405/tools/scagen/src/org/apache/tuscany/sca/cpp/tools/services/xsl/SCA4CPPIntfWrapperHeader.xsl