Correct tag name

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

216 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/LICENSE b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/LICENSE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/LICENSE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/NOTICE b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/NOTICE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/NOTICE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/pom.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/pom.xml
index 3ee440d91c..3ee440d91c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/pom.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/pom.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProviderFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProviderFactory.java
index 99c9d7736e..99c9d7736e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProviderFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProviderFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java
index 1577184b48..1577184b48 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java
index 43bf984440..43bf984440 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java
index 0465dbe7e9..0465dbe7e9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/CorbaException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/CorbaException.java
index 6e54556a2c..6e54556a2c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/CorbaException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/CorbaException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/RequestConfigurationException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/RequestConfigurationException.java
index 9a11d205f2..9a11d205f2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/RequestConfigurationException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/RequestConfigurationException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
index 3936bed9f6..3936bed9f6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaResponse.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaResponse.java
index 25463a7a8a..25463a7a8a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaResponse.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaResponse.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceInstanceCreator.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceInstanceCreator.java
index 514d7055a8..514d7055a8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceInstanceCreator.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceInstanceCreator.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceMethodInterceptor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceMethodInterceptor.java
index 7fba091b41..7fba091b41 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceMethodInterceptor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceMethodInterceptor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java
index ff4732cfdb..ff4732cfdb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
index 2a032f5d25..2a032f5d25 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationException.java
index a82e43e42e..a82e43e42e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationProxy.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationProxy.java
index 5ad9068b8d..5ad9068b8d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationProxy.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationProxy.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/OperationTypes.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/OperationTypes.java
index d93036d6d9..d93036d6d9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/OperationTypes.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/OperationTypes.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/AnnotationAttributes.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/AnnotationAttributes.java
index d2b48d22c7..d2b48d22c7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/AnnotationAttributes.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/AnnotationAttributes.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/NodeType.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/NodeType.java
index 4080a836bc..4080a836bc 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/NodeType.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/NodeType.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTree.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTree.java
index b8c4f88324..b8c4f88324 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTree.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTree.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java
index e8441ed177..e8441ed177 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeNode.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeNode.java
index 7d2183fb01..7d2183fb01 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeNode.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeNode.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/UnionAttributes.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/UnionAttributes.java
index df6358d118..df6358d118 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/UnionAttributes.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/UnionAttributes.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ArrayTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ArrayTypeHelper.java
index 6dbeda3b7c..6dbeda3b7c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ArrayTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ArrayTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/BooleanTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/BooleanTypeHelper.java
index 87d3e93d22..87d3e93d22 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/BooleanTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/BooleanTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ByteTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ByteTypeHelper.java
index eb02f1cbcb..eb02f1cbcb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ByteTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ByteTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/CharTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/CharTypeHelper.java
index 71f8fbfc47..71f8fbfc47 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/CharTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/CharTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/DoubleTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/DoubleTypeHelper.java
index c5019c5c0b..c5019c5c0b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/DoubleTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/DoubleTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/EnumTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/EnumTypeHelper.java
index 6220802ce6..6220802ce6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/EnumTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/EnumTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/FloatTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/FloatTypeHelper.java
index 3214f8b30d..3214f8b30d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/FloatTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/FloatTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/IntTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/IntTypeHelper.java
index b11175064c..b11175064c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/IntTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/IntTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/LongTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/LongTypeHelper.java
index 7b4300a1da..7b4300a1da 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/LongTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/LongTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ReferenceTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ReferenceTypeHelper.java
index 4e0c2893d2..4e0c2893d2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ReferenceTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ReferenceTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/SequenceTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/SequenceTypeHelper.java
index 5862838cd5..5862838cd5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/SequenceTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/SequenceTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ShortTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ShortTypeHelper.java
index 9130db65e4..9130db65e4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ShortTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ShortTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StringTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StringTypeHelper.java
index 4d782efcc5..4d782efcc5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StringTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StringTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StructTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StructTypeHelper.java
index 365d62fb73..365d62fb73 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StructTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StructTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelper.java
index c9d0dd263f..c9d0dd263f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelpersProxy.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelpersProxy.java
index 72e4ccc6fb..72e4ccc6fb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelpersProxy.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelpersProxy.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/UnionTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/UnionTypeHelper.java
index 66c928acec..66c928acec 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/UnionTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/UnionTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java
index 68f71b7169..68f71b7169 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/MethodFinder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/MethodFinder.java
index 912d355641..912d355641 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/MethodFinder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/MethodFinder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/OperationMapper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/OperationMapper.java
index a9fabcb82a..a9fabcb82a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/OperationMapper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/OperationMapper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaArray.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaArray.java
index 24661323be..24661323be 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaArray.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaArray.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElement.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElement.java
index 101bda1ba2..101bda1ba2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElement.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElement.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElementType.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElementType.java
index 3a46fc2b5f..3a46fc2b5f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElementType.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElementType.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 394e7bbd05..394e7bbd05 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
index 7fc58c9b96..7fc58c9b96 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
index 6521255d3b..6521255d3b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
index f0dccd9e7e..f0dccd9e7e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
index 725ce0ec41..725ce0ec41 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
index 0dd34c26e8..0dd34c26e8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
index 962a00d002..962a00d002 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
index 154ca31645..154ca31645 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
index 9f97a6075a..9f97a6075a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
index e0afdde639..e0afdde639 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
index 1a515b613a..1a515b613a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
index c590ebb082..c590ebb082 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
index 977cd6aa4d..977cd6aa4d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
index a5f65930a9..a5f65930a9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
index c1742b4ae3..c1742b4ae3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
index a6682c6f5f..a6682c6f5f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
index c04df97113..c04df97113 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
index 2ff28612c4..2ff28612c4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
index 5c95a673b0..5c95a673b0 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
index a07079b369..a07079b369 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
index 36453797d5..36453797d5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
index f46ac436be..f46ac436be 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
index 0d25b36786..0d25b36786 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
index 5046e3d450..5046e3d450 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
index e3c28f8b91..e3c28f8b91 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
index 775cac8e16..775cac8e16 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
index 32cd9c8df6..32cd9c8df6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
index 3f73557952..3f73557952 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
index a6160a7643..a6160a7643 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
index 6afa6bc806..6afa6bc806 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
index bab0c27f77..bab0c27f77 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
index 514627ff4b..514627ff4b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
index 4629ca9cff..4629ca9cff 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
index aa480f93ac..aa480f93ac 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
index 5ed36ca19b..5ed36ca19b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
index ec1cfadd1e..ec1cfadd1e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
index 29865ace06..29865ace06 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
index d7839ec4db..d7839ec4db 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
index c47d63208f..c47d63208f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
index f767e8c11a..f767e8c11a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
index e7cbb4b8ca..e7cbb4b8ca 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
index 5d27f9969c..5d27f9969c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
index ab01c66675..ab01c66675 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
index f4ea58e55e..f4ea58e55e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
index 82609a36c1..82609a36c1 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
index 1389bd33d9..1389bd33d9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
index a73e252129..a73e252129 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
index 65ce051129..65ce051129 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
index fde204edf8..fde204edf8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
index 71b4fbbdb6..71b4fbbdb6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
index d758a560a9..d758a560a9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
index 464c2ccbc3..464c2ccbc3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
index c053f12a02..c053f12a02 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
index 566689960e..566689960e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
index 6564957081..6564957081 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
index 26669de95a..26669de95a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
index 5a140f5ecc..5a140f5ecc 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
index 2a8fe73417..2a8fe73417 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
index 63e3926dd2..63e3926dd2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
index a8231236eb..a8231236eb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
index ca86420240..ca86420240 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
index 2a8898d38f..2a8898d38f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
index bed30e00ca..bed30e00ca 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
index 73dbd6c198..73dbd6c198 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
index 8f524ffeb1..8f524ffeb1 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
index 3231a136dc..3231a136dc 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
index 28d3ecdc91..28d3ecdc91 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
index 29ff2edfd2..29ff2edfd2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
index b8aea13c8d..b8aea13c8d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
index 0bacb6746a..0bacb6746a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
index c6e8c2a4e0..c6e8c2a4e0 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
index 079cc6e899..079cc6e899 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
index b444ce68d8..b444ce68d8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
index 0b08e1fb67..0b08e1fb67 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
index a87534f88b..a87534f88b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
index e219dfa338..e219dfa338 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
index c0bc0d6ebd..c0bc0d6ebd 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
index ad47595ddf..ad47595ddf 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
index f3d96e8fd7..f3d96e8fd7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
index cb0ab8bcfd..cb0ab8bcfd 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
index 0bde1e701c..0bde1e701c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
index 19b2942cfe..19b2942cfe 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
index 8bb5a9c69d..8bb5a9c69d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
index dc89e71092..dc89e71092 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
index 7b71aa0a9f..7b71aa0a9f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
index 513bab37cc..513bab37cc 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
index c1d06e2ba9..c1d06e2ba9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
index f9ad7b77ac..f9ad7b77ac 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
index cfb292fc01..cfb292fc01 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
index 02f46a7d85..02f46a7d85 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
index 505aa3f026..505aa3f026 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
index 5cbaa109ee..5cbaa109ee 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
index 2f792888fb..2f792888fb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
index 8b2ccc1f73..8b2ccc1f73 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
index 67e224f0be..67e224f0be 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
index 5d4adfba2d..5d4adfba2d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
index c7d86d9179..c7d86d9179 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
index 09b2b85c6a..09b2b85c6a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
index e88b1e06c4..e88b1e06c4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
index d3f996c5b4..d3f996c5b4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
index 7c58d47f7c..7c58d47f7c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
index 5be5a65c43..5be5a65c43 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
index a40d5fa8de..a40d5fa8de 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
index 76f99408f2..76f99408f2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
index d7594b0815..d7594b0815 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
index e9fbcccc36..e9fbcccc36 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
index 6ef187c4e5..6ef187c4e5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
index 59bc015c38..59bc015c38 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
index ec4526cebf..ec4526cebf 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
index 56ab28f0be..56ab28f0be 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
index 73a10d3b7f..73a10d3b7f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
index c5c1e87756..c5c1e87756 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
index 3e45568f01..3e45568f01 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
index bdbf9d995b..bdbf9d995b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
index 7f90520d67..7f90520d67 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
index 7c33b1d449..7c33b1d449 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
index d0ebff5fec..d0ebff5fec 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
index baf5043bc2..baf5043bc2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
index 9ad637fc55..9ad637fc55 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
index 0c9de5bb31..0c9de5bb31 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
index 8746eb7f9b..8746eb7f9b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
index 6d124b0485..6d124b0485 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
index 8cf66e2fac..8cf66e2fac 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
index 5f361512f0..5f361512f0 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
index adc81ea5a2..adc81ea5a2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
index c3fd45d5f4..c3fd45d5f4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
index f6d5421a56..f6d5421a56 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
index 0d1bdd0a13..0d1bdd0a13 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
index 3afe702f87..3afe702f87 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
index 9d30e5ced1..9d30e5ced1 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
index a514b5e222..a514b5e222 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
index 2ea40e345f..2ea40e345f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
index 85ca3798f4..85ca3798f4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
index d8cdf1835a..d8cdf1835a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
index bb72fdbbf3..bb72fdbbf3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
index 606d333bb3..606d333bb3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
index 0ff9540502..0ff9540502 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
index 912bd16f9b..912bd16f9b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
index 79f7959c72..79f7959c72 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
index 495a614d84..495a614d84 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
index 11cfc82ac2..11cfc82ac2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
index e0e56d1017..e0e56d1017 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
index c706661eaa..c706661eaa 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
index c9a31deb27..c9a31deb27 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
index a6b55b8bae..a6b55b8bae 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
index e06a078a93..e06a078a93 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
index 0aec4d278d..0aec4d278d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
index d9bde48a5a..d9bde48a5a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
index cd78588363..cd78588363 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
index fd789e19cb..fd789e19cb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
index 2e205f1d0f..2e205f1d0f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
index 52386aeef7..52386aeef7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
index b7fbb69627..b7fbb69627 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
index dda8203f79..dda8203f79 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
index 20700a0392..20700a0392 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
index 213c7fbd7c..213c7fbd7c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
index 92e18741ae..92e18741ae 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
index 153268983f..153268983f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
index 7ebc3fce85..7ebc3fce85 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
index 296fa0a454..296fa0a454 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
index d691705955..d691705955 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
index 07a9119afb..07a9119afb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
index a99b829e9c..a99b829e9c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
index 5b7caf1010..5b7caf1010 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/resources/arrays_unions.idl b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/resources/arrays_unions.idl
index 0f4ed03b4e..0f4ed03b4e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/resources/arrays_unions.idl
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/resources/arrays_unions.idl
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/resources/enums.idl b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/resources/enums.idl
index 2e4e829b0f..2e4e829b0f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/resources/enums.idl
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/resources/enums.idl
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/resources/exceptions.idl b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/resources/exceptions.idl
index b34ec46458..b34ec46458 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/resources/exceptions.idl
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/resources/exceptions.idl
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/resources/general_tests.idl b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/resources/general_tests.idl
index db253338c3..db253338c3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/resources/general_tests.idl
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/resources/general_tests.idl
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/resources/references.idl b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/resources/references.idl
index 72b58806e6..72b58806e6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-corba-runtime/src/test/resources/references.idl
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-corba-runtime/src/test/resources/references.idl