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

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

322 files changed, 0 insertions, 0 deletions

diff --git a/tags/native-sca-1.0.incubating-M3/runtime/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/Makefile.am
index 8b13058152..8b13058152 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/Makefile.am
index 2b9491ec1c..2b9491ec1c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/deploy.bat
index 178ffb7b39..178ffb7b39 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/Makefile.am
index afc25ae349..afc25ae349 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Exceptions.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Exceptions.cpp
index a75da50c22..a75da50c22 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Exceptions.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Exceptions.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Exceptions.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Exceptions.h
index 3b5b048736..3b5b048736 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Exceptions.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Exceptions.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Operation.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Operation.cpp
index 335ed5d369..335ed5d369 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Operation.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Operation.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Operation.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Operation.h
index 89cf0b63b7..89cf0b63b7 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Operation.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/Operation.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/SCARuntime.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
index b518eff673..b518eff673 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/SCARuntime.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/SCARuntime.h
index ff93bd5005..ff93bd5005 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/SCARuntime.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/SCARuntime.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
index c54d7648e3..c54d7648e3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceProxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceProxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceProxy.h
index f1a0309be1..f1a0309be1 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceProxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceProxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp
index 17666a5bb7..17666a5bb7 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceWrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceWrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceWrapper.h
index 6a44c57675..6a44c57675 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceWrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/core/ServiceWrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/export.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/export.h
index 79b02fe4cf..79b02fe4cf 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/export.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/export.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp
index a20cf1f6da..a20cf1f6da 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ImplementationExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h
index 524af2df77..524af2df77 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ImplementationExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp
index 584945344b..584945344b 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/InterfaceExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/InterfaceExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/InterfaceExtension.h
index 5329104c77..5329104c77 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/InterfaceExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/InterfaceExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp
index a7f60dcbec..a7f60dcbec 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.h
index c3d1e97c9e..c3d1e97c9e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ReferenceBindingExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp
index f5fe361d36..f5fe361d36 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.h
index d2f7e72ed0..d2f7e72ed0 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/extension/ServiceBindingExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Binding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Binding.cpp
index a654b9f0f7..a654b9f0f7 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Binding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Binding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Binding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Binding.h
index 66dc66e853..66dc66e853 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Binding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Binding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Component.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Component.cpp
index 11429193be..11429193be 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Component.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Component.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Component.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Component.h
index 882d79a94c..882d79a94c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Component.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Component.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ComponentType.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ComponentType.cpp
index 306455840c..306455840c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ComponentType.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ComponentType.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ComponentType.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ComponentType.h
index 86f17890e9..86f17890e9 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ComponentType.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ComponentType.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Composite.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Composite.cpp
index 7fcddd812a..7fcddd812a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Composite.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Composite.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Composite.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Composite.h
index 5198e68f6d..5198e68f6d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Composite.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Composite.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReference.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
index be0bf71a17..be0bf71a17 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReference.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReference.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReference.h
index f5e2166e06..f5e2166e06 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReference.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReference.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.cpp
index 7f24328cf5..7f24328cf5 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.h
index b9daa534c2..b9daa534c2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeService.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeService.cpp
index e06dc548c1..e06dc548c1 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeService.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeService.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeService.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeService.h
index 8c626ccac3..8c626ccac3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeService.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/CompositeService.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Contract.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Contract.cpp
index 99a1d04dc2..99a1d04dc2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Contract.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Contract.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Contract.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Contract.h
index e1d526f842..e1d526f842 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Contract.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Contract.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Interface.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Interface.cpp
index f8dd02a74a..f8dd02a74a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Interface.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Interface.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Interface.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Interface.h
index 5ac7736d43..5ac7736d43 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Interface.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Interface.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ModelLoader.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
index d22427c4d4..d22427c4d4 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ModelLoader.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ModelLoader.h
index 68893e7ba3..68893e7ba3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ModelLoader.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ModelLoader.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Reference.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Reference.cpp
index 8820379c4e..8820379c4e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Reference.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Reference.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Reference.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Reference.h
index 33413b488f..33413b488f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Reference.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Reference.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp
index 1f74dfbbb3..1f74dfbbb3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceBinding.h
index 4563f0a736..4563f0a736 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceType.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceType.cpp
index 732a14cace..732a14cace 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceType.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceType.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceType.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceType.h
index 87d38ab330..87d38ab330 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceType.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ReferenceType.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Service.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Service.cpp
index 4df1d1efc6..4df1d1efc6 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Service.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Service.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Service.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Service.h
index a1f2c5d672..a1f2c5d672 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Service.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Service.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp
index ddc5e6a711..ddc5e6a711 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceBinding.h
index 4e68f492a3..4e68f492a3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceType.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceType.cpp
index 819a832443..819a832443 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceType.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceType.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceType.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceType.h
index 08a76e3b3f..08a76e3b3f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceType.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/ServiceType.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
index 5a98db3cdd..5a98db3cdd 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLDefinition.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLDefinition.h
index 9be553205a..9be553205a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLDefinition.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLDefinition.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp
index 5fa45a9967..5fa45a9967 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLInterface.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLInterface.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLInterface.h
index b071dd221e..b071dd221e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLInterface.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLInterface.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp
index 12a0b61fd2..12a0b61fd2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLOperation.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLOperation.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLOperation.h
index 874da80450..874da80450 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLOperation.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/WSDLOperation.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Wire.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Wire.cpp
index 03f475af09..03f475af09 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Wire.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Wire.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Wire.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Wire.h
index ab136e9109..ab136e9109 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Wire.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/model/Wire.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
index 48cc0aa1e6..48cc0aa1e6 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/DefaultLogWriter.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
index 80e07d696c..80e07d696c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/DefaultLogWriter.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/File.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/File.cpp
index 507c1b38ea..507c1b38ea 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/File.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/File.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/File.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/File.h
index 944a192cf6..944a192cf6 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/File.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/File.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
index 56eb3146dd..56eb3146dd 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/FileLogWriter.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/FileLogWriter.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/FileLogWriter.h
index 5925fdca85..5925fdca85 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/FileLogWriter.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/FileLogWriter.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Library.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Library.cpp
index 366fcdf1f3..366fcdf1f3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Library.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Library.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Library.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Library.h
index 6b0a17d2b7..6b0a17d2b7 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Library.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Library.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/LogWriter.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/LogWriter.cpp
index e551d04eda..e551d04eda 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/LogWriter.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/LogWriter.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/LogWriter.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/LogWriter.h
index 5a6a5c38f7..5a6a5c38f7 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/LogWriter.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/LogWriter.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logger.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logger.cpp
index 9d55c5fb43..9d55c5fb43 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logger.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logger.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logger.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logger.h
index eccf3cf02f..eccf3cf02f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logger.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logger.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logging.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logging.h
index bf1419faa8..bf1419faa8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logging.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Logging.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Mutex.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Mutex.cpp
index 8a9494d7de..8a9494d7de 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Mutex.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Mutex.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Mutex.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Mutex.h
index d509ba6d73..d509ba6d73 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Mutex.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Mutex.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Queue.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Queue.cpp
index 099e3cece8..099e3cece8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Queue.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Queue.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Queue.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Queue.h
index e2ff104631..e2ff104631 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Queue.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Queue.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/SDOUtils.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/SDOUtils.cpp
index f2ccda9d69..f2ccda9d69 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/SDOUtils.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/SDOUtils.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/SDOUtils.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/SDOUtils.h
index 8b5b3b8130..8b5b3b8130 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/SDOUtils.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/SDOUtils.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Thread.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Thread.cpp
index d70ce28190..d70ce28190 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Thread.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Thread.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Thread.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Thread.h
index 2ca9142994..2ca9142994 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Thread.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Thread.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/ThreadLocal.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/ThreadLocal.cpp
index 33aa1f7605..33aa1f7605 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/ThreadLocal.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/ThreadLocal.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/ThreadLocal.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/ThreadLocal.h
index 556055f183..556055f183 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/ThreadLocal.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/ThreadLocal.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Utils.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Utils.cpp
index 98a929392d..98a929392d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Utils.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Utils.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Utils.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Utils.h
index bbe1aa812a..bbe1aa812a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Utils.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/core/src/tuscany/sca/util/Utils.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/Makefile.am
index 1cc28fe80e..1cc28fe80e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/Makefile.am
index 7fac33118a..7fac33118a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/deploy.bat
index 644cbfc4a3..644cbfc4a3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/Makefile.am
index bb28aed8b9..bb28aed8b9 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp
index d686c4c09f..d686c4c09f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ComponentContext.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h
index 2c305c5161..2c305c5161 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ComponentContext.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp
index d3f06e1b12..d3f06e1b12 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h
index a047f82e46..a047f82e46 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/CompositeContext.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h
index 6d64a32dd6..6d64a32dd6 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/ServiceRuntimeException.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/export.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/export.h
index 8a69913be4..8a69913be4 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/export.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/export.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/sca.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/sca.h
index 6cce9453d7..6cce9453d7 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/sca.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/osoa/sca/sca.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp
index 74a30fb772..74a30fb772 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.h
index d6c872629d..d6c872629d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
index b5312ab243..b5312ab243 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h
index 8eb7b88691..8eb7b88691 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPImplementationExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp
index 7bb84a7673..7bb84a7673 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h
index 04ac9f6970..04ac9f6970 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPInterfaceExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
index cc45ea9fb8..cc45ea9fb8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h
index 8406e9bc44..8406e9bc44 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceProxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp
index fbf8281178..fbf8281178 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h
index e8111b6423..e8111b6423 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CPPServiceWrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
index 3de0cb968c..3de0cb968c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h
index 412c276d8c..412c276d8c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/ComponentContextImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp
index ae8183231e..ae8183231e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h
index ed0bb8b51c..ed0bb8b51c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/CompositeContextImpl.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.cpp
index f8aad90f7a..f8aad90f7a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.h
index b4cf31220a..b4cf31220a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/TuscanyRuntime.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
index 9e5a227f01..9e5a227f01 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h
index 11f487361d..11f487361d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp
index 2322d1bdf5..2322d1bdf5 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h
index fdbf314d3d..fdbf314d3d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPInterface.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp
index ba20a1d5a0..ba20a1d5a0 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h
index 398417011f..398417011f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp
index 45afea8375..45afea8375 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h
index 13b88a84dd..13b88a84dd 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPServiceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/xsd/sca-implementation-cpp.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/xsd/sca-implementation-cpp.xsd
index 7292f747b8..7292f747b8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/xsd/sca-implementation-cpp.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/xsd/sca-implementation-cpp.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/xsd/sca-interface-cpp.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/xsd/sca-interface-cpp.xsd
index 585bac0dc4..585bac0dc4 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/xsd/sca-interface-cpp.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/cpp/xsd/sca-interface-cpp.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/AUTHORS b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/AUTHORS
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/AUTHORS
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/AUTHORS
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/COPYING b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/COPYING
index 6b0b1270ff..6b0b1270ff 100755
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/COPYING
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/COPYING
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/ChangeLog b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/ChangeLog
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/ChangeLog
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/ChangeLog
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/INSTALL b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/INSTALL
index 059a43057b..059a43057b 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/INSTALL
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/INSTALL
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/LICENSE b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/LICENSE
index f433b1a53f..f433b1a53f 100755
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/LICENSE
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/LICENSE
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/Makefile.am
index fb661fec63..fb661fec63 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/NEWS b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/NEWS
index e69de29bb2..e69de29bb2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/NEWS
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/NEWS
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/NOTICE b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/NOTICE
index b240b0a121..b240b0a121 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/NOTICE
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/NOTICE
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/README
index ad96622516..ad96622516 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/README
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/VSExpress/tuscany_sca_php.vcproj b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/VSExpress/tuscany_sca_php.vcproj
index 1a8f668c19..1a8f668c19 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/VSExpress/tuscany_sca_php.vcproj
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/VSExpress/tuscany_sca_php.vcproj
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/autogen.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/autogen.sh
index af38864985..af38864985 100755
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/autogen.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/autogen.sh
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/build.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/build.sh
index 41e96d0565..41e96d0565 100755
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/build.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/build.sh
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/configure.ac b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/configure.ac
index d68d262b78..d68d262b78 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/configure.ac
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/configure.ac
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/deploy.bat
index 32d8378803..32d8378803 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/Makefile.am
index 920828ef4f..920828ef4f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/Makefile.am
index fd34c6442a..fd34c6442a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/README b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/README
index dbee1f5f85..dbee1f5f85 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/README
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/README
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.app.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.app.composite
index ada4d89a1c..ada4d89a1c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.app.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.app.composite
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/Makefile.am
index 548f9bdcb8..548f9bdcb8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/calculator_client.py b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/calculator_client.py
index d4b37ee2b2..d4b37ee2b2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/calculator_client.py
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/calculator_client.py
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/runclient.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/runclient.sh
index 54ebfdbde4..54ebfdbde4 100755
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/runclient.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator.client/runclient.sh
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.componentType
index 5a6c3a199e..5a6c3a199e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.php
index f0f35bab56..f0f35bab56 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Calculator.php
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.componentType
index b50b20d9c6..b50b20d9c6 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.php
index 5a08e5b063..5a08e5b063 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Divide.php
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.componentType b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.componentType
index f945c6af8c..f945c6af8c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.componentType
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.componentType
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.php
index 0a955f36d3..0a955f36d3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Log.php
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Makefile.am
index 10020c4f03..10020c4f03 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Multiply.php b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Multiply.php
index ed2e75edc8..ed2e75edc8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Multiply.php
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/Multiply.php
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/sample.calculator.composite b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/sample.calculator.composite
index f1a82a70db..f1a82a70db 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/sample.calculator.composite
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/samples/PHPCalculator/sample.calculator/sample.calculator.composite
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/Makefile.am
index b3622779e6..b3622779e6 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp
index 0ffb660139..0ffb660139 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.h
index 971ed93c86..971ed93c86 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
index 101667302f..101667302f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h
index 604c4ea102..604c4ea102 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPImplementationExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.cpp
index a07c499dec..a07c499dec 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.h
index 4279376300..4279376300 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPInterfaceExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.cpp
index 4b66c42a5b..4b66c42a5b 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.h
index bddb262617..bddb262617 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceProxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
index 0236d3bc7f..0236d3bc7f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h
index be20f34217..be20f34217 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/export.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/export.h
index 11a9519361..11a9519361 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/export.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/export.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
index 63f1672ec5..63f1672ec5 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h
index 78e678dff5..78e678dff5 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPImplementation.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.cpp
index cbea3f2b71..cbea3f2b71 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.h
index 9a4f658eb0..9a4f658eb0 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPInterface.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.cpp
index 8a8d15fe40..8a8d15fe40 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.h
index 8010752980..8010752980 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp
index 4d18424ae2..4d18424ae2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h
index ef3d6b1604..ef3d6b1604 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/model/PHPServiceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/php_sca.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/php_sca.h
index 8aea8dadb2..8aea8dadb2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/php_sca.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/php_sca.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/sca.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/sca.cpp
index 4078226f63..4078226f63 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/sca.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/sca.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/sca.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/sca.h
index 5bbc9001dc..5bbc9001dc 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/sca.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/src/tuscany/sca/php/sca.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/xsd/sca-implementation-php.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/xsd/sca-implementation-php.xsd
index 0f32f120e6..0f32f120e6 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/xsd/sca-implementation-php.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/php/xsd/sca-implementation-php.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/Makefile.am
index 83e70b4b94..83e70b4b94 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/deploy.bat
index 43c7a45777..43c7a45777 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/deploymodule.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/deploymodule.bat
index 4403b0ce6c..4403b0ce6c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/deploymodule.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/deploymodule.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/Makefile.am
index ec81dd5840..ec81dd5840 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp
index 0274ffc774..0274ffc774 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.h
index 783f37a228..783f37a228 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
index 84cc34c6a4..84cc34c6a4 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h
index c94925c3fc..c94925c3fc 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonImplementationExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp
index 1d5e3b6361..1d5e3b6361 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h
index 803d94743d..803d94743d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonInterfaceExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.cpp
index 9282bb953c..9282bb953c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h
index 64f856f51d..64f856f51d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceProxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp
index 57ac5baeb5..57ac5baeb5 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h
index fbf75b3223..fbf75b3223 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/export.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/export.h
index b608a50711..b608a50711 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/export.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/export.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
index 235468eca9..235468eca9 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h
index 75b14529bf..75b14529bf 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonImplementation.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp
index 3c30f363b8..3c30f363b8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h
index cfc2ca8914..cfc2ca8914 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonInterface.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp
index c2564c4db1..c2564c4db1 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h
index f993730d8e..f993730d8e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp
index 061aeb7515..061aeb7515 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h
index 9a803cdced..9a803cdced 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/model/PythonServiceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp
index bd34549f8a..bd34549f8a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/sca_module.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/sca_proxy.py b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/sca_proxy.py
index 92a224275e..92a224275e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/sca_proxy.py
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/src/tuscany/sca/python/sca_proxy.py
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/xsd/sca-implementation-python.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/xsd/sca-implementation-python.xsd
index e1c7247992..e1c7247992 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/xsd/sca-implementation-python.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/xsd/sca-implementation-python.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/xsd/sca-interface-python.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/xsd/sca-interface-python.xsd
index dd9075c7fb..dd9075c7fb 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/xsd/sca-interface-python.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/python/xsd/sca-interface-python.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/Makefile.am
index 742a8152ad..742a8152ad 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/deploy.bat
index 6ad4ef66ea..6ad4ef66ea 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/Makefile.am
index f963effea2..f963effea2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/deploy.bat
index 07c74d9e81..07c74d9e81 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/Makefile.am
index 8007a89d13..8007a89d13 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.cpp
index c69febf39a..c69febf39a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.h
index de61ee5751..de61ee5751 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/RESTInterfaceExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/exportinterface.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/exportinterface.h
index f3636f0d39..f3636f0d39 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/exportinterface.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/exportinterface.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.cpp
index 34feda2049..34feda2049 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.h
index 88aacecc16..88aacecc16 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/interface/src/tuscany/sca/rest/model/RESTInterface.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/Makefile.am
index 2a0247f16f..2a0247f16f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/Makefile.am
index f963effea2..f963effea2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/Makefile.am
index 834853a6cf..834853a6cf 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.cpp
index f8eb9ad05c..f8eb9ad05c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.h
index ad1d861d95..ad1d861d95 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceBindingExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.cpp
index 424039666f..424039666f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.h
index af2fbcfc94..af2fbcfc94 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/RESTServiceWrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.cpp
index 72701bfa65..72701bfa65 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.h
index d19bcdacf5..d19bcdacf5 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/curl/src/tuscany/sca/rest/model/RESTServiceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/deploy.bat
index 6717749990..6717749990 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/reference/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/Makefile.am
index 2ecfda6c6c..2ecfda6c6c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/deploy.bat
index bea89aa81d..bea89aa81d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/deploymod.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/deploymod.bat
index b10b15d5c1..b10b15d5c1 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/deploymod.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/deploymod.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/Makefile.am
index f963effea2..f963effea2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/Makefile.am
index 49d11faee3..49d11faee3 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/ModREST.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/ModREST.cpp
index eb3ac60e01..eb3ac60e01 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/ModREST.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/ModREST.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.cpp
index 18720f42f5..18720f42f5 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.h
index 0d9e41841b..0d9e41841b 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTReferenceBindingExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.cpp
index 5806c83773..5806c83773 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.h
index 387add3f35..387add3f35 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/RESTServiceProxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/export.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/export.h
index 802218a2fe..802218a2fe 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/export.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/export.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp
index 1b4b2d3403..1b4b2d3403 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h
index d19f3926a1..d19f3926a1 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/service/httpd/src/tuscany/sca/rest/model/RESTReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/xsd/sca-binding-rest.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/xsd/sca-binding-rest.xsd
index a2fd41121c..a2fd41121c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/xsd/sca-binding-rest.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/xsd/sca-binding-rest.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/xsd/sca-interface-rest.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/xsd/sca-interface-rest.xsd
index 3f1aca6ecd..3f1aca6ecd 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/xsd/sca-interface-rest.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/rest/xsd/sca-interface-rest.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/Makefile.am
index 08ba2f553f..08ba2f553f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/deploy.bat
index c126025bb6..c126025bb6 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/Makefile.am
index 41ce75925b..41ce75925b 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/deploy.bat
index 8c8d1e0794..8c8d1e0794 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/src/Extension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/src/Extension.cpp
index 458700e5f1..458700e5f1 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/src/Extension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/src/Extension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/src/extconf.rb b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/src/extconf.rb
index 9c41843d63..9c41843d63 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/src/extconf.rb
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/extension/src/extconf.rb
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/Makefile.am
index 50dd2d15b8..50dd2d15b8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/Ruby.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/Ruby.h
index a6b8ee8ffa..a6b8ee8ffa 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/Ruby.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/Ruby.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp
index 5554ac6756..5554ac6756 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h
index 2414b66fb1..2414b66fb1 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp
index 5789517cfd..5789517cfd 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.h
index 232431ca1e..232431ca1e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
index aa416f139a..aa416f139a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h
index 79d9ed2dbe..79d9ed2dbe 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyImplementationExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
index bf160cc821..bf160cc821 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h
index e6c37cf1da..e6c37cf1da 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp
index ee87bdd132..ee87bdd132 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h
index 2526084a72..2526084a72 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h
index 5db72a1ebe..5db72a1ebe 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/export.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
index fa30642318..fa30642318 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
index c7bc851635..c7bc851635 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp
index d1dda36cb5..d1dda36cb5 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h
index e71d69506c..e71d69506c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.cpp
index 163f8a9d8b..163f8a9d8b 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.h
index b772daf712..b772daf712 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyServiceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/xsd/sca-implementation-ruby.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/xsd/sca-implementation-ruby.xsd
index 3508b23f94..3508b23f94 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/xsd/sca-implementation-ruby.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ruby/xsd/sca-implementation-ruby.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/Makefile.am
index 50dfb45557..50dfb45557 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/deploy.bat
index b3a33a8011..b3a33a8011 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/Makefile.am
index 2b9491ec1c..2b9491ec1c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/deploy.bat
index 0afc3ff4ea..0afc3ff4ea 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/Makefile.am
index ee1b9ea5e8..ee1b9ea5e8 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.cpp
index 7d70f595cc..7d70f595cc 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.h
index 389541061a..389541061a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/SCAServiceBindingExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.cpp
index 3b5564a765..3b5564a765 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.h
index d73a10f202..d73a10f202 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/reference/src/tuscany/sca/binding/model/SCAServiceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/Makefile.am
index 2b9491ec1c..2b9491ec1c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/deploy.bat
index e65ccb7715..e65ccb7715 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/Makefile.am
index 2b062f199b..2b062f199b 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.cpp
index 789d8794df..789d8794df 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.h
index 8cde2fbef4..8cde2fbef4 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/SCAReferenceBindingExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.cpp
index b8eaaaa1f9..b8eaaaa1f9 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.h
index f3e699e2ee..f3e699e2ee 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/service/src/tuscany/sca/binding/model/SCAReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/xsd/sca-binding-sca.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/xsd/sca-binding-sca.xsd
index 1051c3910c..1051c3910c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/xsd/sca-binding-sca.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/sca/xsd/sca-binding-sca.xsd
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/Makefile.am
index 806786ce04..806786ce04 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/deploy.bat
index 567875624f..567875624f 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/Makefile.am
index 18e9ba89b9..18e9ba89b9 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/Makefile.am
index 2b9491ec1c..2b9491ec1c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/Makefile.am
index 4996d72c77..4996d72c77 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
index 20ceba5a87..20ceba5a87 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.h
index 397440dd5d..397440dd5d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp
index 53d6075bbd..53d6075bbd 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.h
index 68dd657657..68dd657657 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceBindingExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.cpp
index 4adcd5b4ff..4adcd5b4ff 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.h
index f7aebbb575..f7aebbb575 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/WSServiceWrapper.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/export.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/export.h
index d0e708f1a1..d0e708f1a1 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/export.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/export.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.cpp
index 26d8dffc45..26d8dffc45 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.h
index 3c8c5eb12d..3c8c5eb12d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/model/WSServiceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/deploy.bat
index 6d8c426da2..6d8c426da2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/reference/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/Makefile.am
index 18e9ba89b9..18e9ba89b9 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/Makefile.am
index feadf9e317..feadf9e317 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/Makefile.am b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/Makefile.am
index 95924779da..95924779da 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/Makefile.am
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/Makefile.am
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/axis2.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/axis2.xml
index 641085466e..641085466e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/axis2.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/axis2.xml
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/deploy.bat
index 6493e1cec9..6493e1cec9 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/deploy.sh b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/deploy.sh
index ffe571b0ee..ffe571b0ee 100755
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/deploy.sh
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/deploy.sh
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/module.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/module.xml
index 97d4d43a86..97d4d43a86 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/module.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/module.xml
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/services.xml b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/services.xml
index 335d4d96be..335d4d96be 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/services.xml
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/services.xml
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp
index b6d2ac9225..b6d2ac9225 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2DispatcherModule.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2DispatcherModule.cpp
index 0dc8f3358a..0dc8f3358a 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2DispatcherModule.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2DispatcherModule.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
index 13c87c8c87..13c87c8c87 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.cpp
index 09c3862590..09c3862590 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.h
index 4e8b069010..4e8b069010 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Utils.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.cpp
index 24a7552bc4..24a7552bc4 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.h
index 712e7d2646..712e7d2646 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSReferenceBindingExtension.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
index 8dd27ec60d..8dd27ec60d 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h
index 4d57514688..4d57514688 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/export.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/export.h
index e52adf4db0..e52adf4db0 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/export.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/export.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp
index 220caf2d0c..220caf2d0c 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.cpp
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h
index b565e6c30e..b565e6c30e 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/model/WSReferenceBinding.h
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/deploy.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/deploy.bat
index ac4b50190b..ac4b50190b 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/deploy.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/deploy.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/deploymodule.bat b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/deploymodule.bat
index 246728b6b2..246728b6b2 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/deploymodule.bat
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/service/deploymodule.bat
diff --git a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/xsd/sca-binding-webservice.xsd b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/xsd/sca-binding-webservice.xsd
index 2c1c2abbcc..2c1c2abbcc 100644
--- a/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/xsd/sca-binding-webservice.xsd
+++ b/sca-cpp/tags/native-sca-1.0.incubating-M3/runtime/extensions/ws/xsd/sca-binding-webservice.xsd