Correct tag name

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

92 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
index c86c876075..c86c876075 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
index 29dcc20f0b..29dcc20f0b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
index f51931c53b..f51931c53b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
index 78096b20ab..78096b20ab 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
index 4f463b105d..4f463b105d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
index c82543c4ca..c82543c4ca 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
index 14a5f565fc..14a5f565fc 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
index b174dea6ce..b174dea6ce 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
index 32ac611e54..32ac611e54 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
index b386495a08..b386495a08 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
index af5230a163..af5230a163 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
index e31186ed35..e31186ed35 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
index 7d94e73f35..7d94e73f35 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
index 78b0887482..78b0887482 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
index 2bcf13f679..2bcf13f679 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
index c5b68389b2..c5b68389b2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
index b577180291..b577180291 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
index ed6c3df8fa..ed6c3df8fa 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
index 1d178421cf..1d178421cf 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
index efa362a929..efa362a929 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
index f928f91a02..f928f91a02 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
index 3bea79b076..3bea79b076 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
index 692d6861ba..692d6861ba 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
index 03c18c26b8..03c18c26b8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
index 0bf66b2817..0bf66b2817 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
index 517e5579a4..517e5579a4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
index 45eab7da1b..45eab7da1b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
index 4dc79c3844..4dc79c3844 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
index d3106c7052..d3106c7052 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
index 123400fbdd..123400fbdd 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
index 68cb5c2966..68cb5c2966 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
index 38a4fb10d6..38a4fb10d6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
index d7e797bbb9..d7e797bbb9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
index 7530156b11..7530156b11 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
index d35b27fd24..d35b27fd24 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
index 3f64d2405b..3f64d2405b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index 588c43b8b1..588c43b8b1 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index d19aa237cd..d19aa237cd 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
index 97c69c33cb..97c69c33cb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
index b5b40811ad..b5b40811ad 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index 2b37c30451..2b37c30451 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index 0b3c043340..0b3c043340 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
index 9acb4be6f8..9acb4be6f8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
index fcb48259b9..fcb48259b9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index 934f2f7aa0..934f2f7aa0 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
index c559a42bdc..c559a42bdc 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
index 62e8b4d3ee..62e8b4d3ee 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
index 4c6abc726c..4c6abc726c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
index a2cbd1365b..a2cbd1365b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
index 6e182a6a14..6e182a6a14 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
index ca2bf051c8..ca2bf051c8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
index 733544d387..733544d387 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index d6911281c8..d6911281c8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
index a3c8429c7b..a3c8429c7b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
index fc4bea3d9f..fc4bea3d9f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
index 0b36b178f3..0b36b178f3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index cb836e42c1..cb836e42c1 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
index 875a252798..875a252798 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
index 906628ee32..906628ee32 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java
index f2907638ad..f2907638ad 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
index 2c4d657882..2c4d657882 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
index dd3a4f9ac3..dd3a4f9ac3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index 246f9c45d6..246f9c45d6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
index 1168d1d0dd..1168d1d0dd 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
index 7a1965198a..7a1965198a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
index 786988613b..786988613b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
index 3ae1ca51c5..3ae1ca51c5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
index a6663aba09..a6663aba09 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
index 5ae8b94647..5ae8b94647 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
index 49f89661b1..49f89661b1 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
index 8fdfcc63c9..8fdfcc63c9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
index 1cfb6b06a4..1cfb6b06a4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
index 0a20d793f7..0a20d793f7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
index 6b2980b989..6b2980b989 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
index b19c14b3e0..b19c14b3e0 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
index 842ed4c547..842ed4c547 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
index 75261e11a8..75261e11a8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
index 85a6626cdd..85a6626cdd 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
index c27b112f8a..c27b112f8a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
index 24125b154c..24125b154c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
index 0471b2c52e..0471b2c52e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
index 0f83dad97d..0f83dad97d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
index 15959c0608..15959c0608 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
index bb46a2499b..bb46a2499b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
index ea8d0e876c..ea8d0e876c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
index 5b838116c5..5b838116c5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkScheduler.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkScheduler.java
index 55b0acded9..55b0acded9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkScheduler.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkScheduler.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
index 91d00a58d9..91d00a58d9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/Work.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/Work.java
index c521c60f79..c521c60f79 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/Work.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/Work.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEvent.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEvent.java
index 8e9a3b4c53..8e9a3b4c53 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEvent.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEvent.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItem.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItem.java
index 8320c7364f..8320c7364f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItem.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItem.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java
index 19bfaaa560..19bfaaa560 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java