Correct tag name

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

173 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/LICENSE b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/LICENSE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/LICENSE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/NOTICE b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/NOTICE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/NOTICE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/pom.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/pom.xml
index 446e06032a..446e06032a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/pom.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/pom.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
index ac8af3ed64..ac8af3ed64 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
index a93710d266..a93710d266 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
index b5d3254fa0..b5d3254fa0 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
index 5285caa481..5285caa481 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
index 2513c63e38..2513c63e38 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
index d8eef18c74..d8eef18c74 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
index ffce7ce467..ffce7ce467 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
index dd454be7c5..dd454be7c5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
index 4a8c8f31b8..4a8c8f31b8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
index 4d062859b9..4d062859b9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
index 5aeebcca36..5aeebcca36 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
index eefe82f1d9..eefe82f1d9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
index 9f587f58de..9f587f58de 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
index baf9eb9cc1..baf9eb9cc1 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
index ca9c08fe63..ca9c08fe63 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
index 70c368a0e6..70c368a0e6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
index 17450f43cb..17450f43cb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
index 5d4d999453..5d4d999453 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
index f94b24762a..f94b24762a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
index 25c09231c5..25c09231c5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
index e6ebb5abc3..e6ebb5abc3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
index 135fde09ff..135fde09ff 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
index ef4e67d79a..ef4e67d79a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
index 2903cc6fc8..2903cc6fc8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
index 65bff6efdb..65bff6efdb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
index 4a5ad98e5b..4a5ad98e5b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
index e7f419286d..e7f419286d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
index 10825ca4b6..10825ca4b6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
index a97d21e1e5..a97d21e1e5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
index 95a9f63688..95a9f63688 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
index ee3507ef80..ee3507ef80 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
index 515a7c8a43..515a7c8a43 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
index a7b175cf9b..a7b175cf9b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
index 8c85b46c65..8c85b46c65 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
index 63e41bae7b..63e41bae7b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory
index f2feb6156a..f2feb6156a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 0871ddf4be..0871ddf4be 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
index ba8da101c6..ba8da101c6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
index 628a308c86..628a308c86 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
index 29dcfa8169..29dcfa8169 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
index cc852cc677..cc852cc677 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java
index d502462688..d502462688 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
index 4de0a4e8c7..4de0a4e8c7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
index 214779ed3f..214779ed3f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
index c470b8cf3d..c470b8cf3d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
index ed7a0e7d03..ed7a0e7d03 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
index c1650c3a83..c1650c3a83 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
index 40ad1b1e95..40ad1b1e95 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
index de371e09bb..de371e09bb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
index 1fb7abb917..1fb7abb917 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
index e993cdd382..e993cdd382 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
index 82264c77c9..82264c77c9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
index a5e12d181c..a5e12d181c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
index ed6bf7ddc4..ed6bf7ddc4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
index 408cedb8be..408cedb8be 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/LICENSE b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/LICENSE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/LICENSE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/NOTICE b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/NOTICE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/NOTICE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/pom.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/pom.xml
index b2f7695e76..b2f7695e76 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/pom.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/pom.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
index ecbf0c4c78..ecbf0c4c78 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
index 7445209672..7445209672 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ff43eebcfc..ff43eebcfc 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties
index 210b715da8..210b715da8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/AddService.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/AddService.java
index 9c22177684..9c22177684 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/AddService.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
index 3f28d740a7..3f28d740a7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/CalculatorService.java
index e0cf23dc17..e0cf23dc17 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/CalculatorService.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
index c1fceb575d..c1fceb575d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/DivideService.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/DivideService.java
index 9599c86292..9599c86292 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/DivideService.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
index e1f35f99b5..e1f35f99b5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/MultiplyService.java
index 7a3d06c15e..7a3d06c15e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/MultiplyService.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
index d621407908..d621407908 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/SubtractService.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/SubtractService.java
index 21af91f392..21af91f392 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/SubtractService.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
index 4fed0a8c6a..4fed0a8c6a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
index e5912906f5..e5912906f5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
index 27e3579c35..27e3579c35 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
index 2ec09dae7a..2ec09dae7a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
index c6a077ffa6..c6a077ffa6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
index cddc134c2c..cddc134c2c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
index 9147133d5d..9147133d5d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/LICENSE b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/LICENSE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/LICENSE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/NOTICE b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/NOTICE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/NOTICE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/pom.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/pom.xml
index eef62277cb..eef62277cb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/pom.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/pom.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
index c8b7c072ac..c8b7c072ac 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
index e44ebd7c91..e44ebd7c91 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
index 2198a632c0..2198a632c0 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
index 2ad7edbd6f..2ad7edbd6f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
index 8228c80372..8228c80372 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
index 97773879fa..97773879fa 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
index 0bcec3c78f..0bcec3c78f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
index c0b04b4b4e..c0b04b4b4e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
index e5fa399bf6..e5fa399bf6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java
index 46594e0f50..46594e0f50 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
index 7d8c673e3f..7d8c673e3f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
index 375896cf26..375896cf26 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
index c4c528f4f2..c4c528f4f2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
index 1aca15ebb8..1aca15ebb8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
index 85c2f73f75..85c2f73f75 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
index 4fa40dee4b..4fa40dee4b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
index 9596fe0808..9596fe0808 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
index 4a3ce0c343..4a3ce0c343 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
index c6e6b6e4d6..c6e6b6e4d6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
index bc6551d45d..bc6551d45d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
index 556f0b77e9..556f0b77e9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
index 17e28479d3..17e28479d3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
index 177ceaa57c..177ceaa57c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
index 985f8baa82..985f8baa82 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
index efd04262dd..efd04262dd 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
index 50e4d46e97..50e4d46e97 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
index 88a245cbf3..88a245cbf3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
index 9b834e7e87..9b834e7e87 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
index 4325faef26..4325faef26 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
index b9e1923e73..b9e1923e73 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
index 300ad6817e..300ad6817e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
index 2d177b3f76..2d177b3f76 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
index 5619275b82..5619275b82 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
index b7f6748ed2..b7f6748ed2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
index 9fe2fcd468..9fe2fcd468 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
index f5696122df..f5696122df 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
index 6a0d60c92f..6a0d60c92f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
index 8f50852c2d..8f50852c2d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
index 54f7dfad1e..54f7dfad1e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
index 25196c56e5..25196c56e5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
index ccfbaf0043..ccfbaf0043 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
index e130f4221d..e130f4221d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
index 583ccc86cd..583ccc86cd 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
index 91b97b2caf..91b97b2caf 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
index a1e1d01ab3..a1e1d01ab3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
index 976b4da120..976b4da120 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
index e77a6beb0d..e77a6beb0d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
index debb5cbacc..debb5cbacc 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
index 7147da55b4..7147da55b4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
index 6039bd91f8..6039bd91f8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
index 453cfa35fe..453cfa35fe 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
index 954a3abbc8..954a3abbc8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
index cf1b4a9830..cf1b4a9830 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
index a1f8a766ae..a1f8a766ae 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
index 3d43e39ce8..3d43e39ce8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
index e15f9a0d6a..e15f9a0d6a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
index a3d3889d30..a3d3889d30 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
index 6854acdc2a..6854acdc2a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
index e1ca3ea565..e1ca3ea565 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
index 57d224b2bf..57d224b2bf 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index df60d57cf9..df60d57cf9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
index dc9de12632..dc9de12632 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
index fe93424d28..fe93424d28 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
index 5beb31f0f9..5beb31f0f9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
index e5abb07760..e5abb07760 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
index fa1527fbe5..fa1527fbe5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
index 690869ccb8..690869ccb8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
index 8c10df2146..8c10df2146 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
index 365fb12afe..365fb12afe 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
index f77c9abad9..f77c9abad9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
index c6b2626e9c..c6b2626e9c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
index 4555736813..4555736813 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
index aa2671071c..aa2671071c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
index ffc67325fa..ffc67325fa 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
index 09bcc7ab6c..09bcc7ab6c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
index c7f340bd46..c7f340bd46 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
index e98a8fec1f..e98a8fec1f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
index ff267cd938..ff267cd938 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
index ed0527d3d7..ed0527d3d7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
index 70c615ca24..70c615ca24 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
index 388a1aae8b..388a1aae8b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
index aad6b96cf9..aad6b96cf9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
index 4a625982b0..4a625982b0 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
index 8d5e816a08..8d5e816a08 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
index d68b1530f0..d68b1530f0 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
index 7bb8e15696..7bb8e15696 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
index d7de4e522e..d7de4e522e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
index 10f0500e4d..10f0500e4d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
index aea90aa6eb..aea90aa6eb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java