Correct tag name

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

82 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
index 8e6a78551a..8e6a78551a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
index 940a69784b..940a69784b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
index 31a8b26c02..31a8b26c02 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
index f4c210ba7c..f4c210ba7c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
index 7fdeee189b..7fdeee189b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
index 892700779f..892700779f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
index e5ea616fdb..e5ea616fdb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
index 8a6d57e825..8a6d57e825 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
index 8980fa26ff..8980fa26ff 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
index c1a8162836..c1a8162836 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
index 4511fb454b..4511fb454b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
index 101d05f9cb..101d05f9cb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
index 527cfbd667..527cfbd667 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
index e99845d886..e99845d886 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
index 76eb204f21..76eb204f21 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
index 536801016c..536801016c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
index 3b2aacef4c..3b2aacef4c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
index 94357cd98d..94357cd98d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
index 66f0a198e4..66f0a198e4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
index e6e6b05a42..e6e6b05a42 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
index 7c53d529a8..7c53d529a8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
index a500a2a854..a500a2a854 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
index a6a2b15a15..a6a2b15a15 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
index 209416c203..209416c203 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
index 24395ee0a6..24395ee0a6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
index 1dba2533d2..1dba2533d2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
index 5783d0de02..5783d0de02 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
index bec3e6ff29..bec3e6ff29 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
index 91ba05404a..91ba05404a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
index 9012aaeb25..9012aaeb25 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
index ca64c15305..ca64c15305 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
index 1c678a2b96..1c678a2b96 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
index 8c6f684425..8c6f684425 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
index 5b28aedcf9..5b28aedcf9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
index bf6094582e..bf6094582e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
index ee12161903..ee12161903 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
index bf94da374c..bf94da374c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
index 92f10cd4b3..92f10cd4b3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
index 264566aae4..264566aae4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
index 8066184da9..8066184da9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
index 5e3afc8195..5e3afc8195 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
index b43ad5c214..b43ad5c214 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
index 3840b1caf9..3840b1caf9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
index f2a36d89db..f2a36d89db 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
index 8195c80c49..8195c80c49 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
index beba8fdc9b..beba8fdc9b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
index cfc747f59e..cfc747f59e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
index a9c901a431..a9c901a431 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
index 864de25fd6..864de25fd6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
index b3f2c060fb..b3f2c060fb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
index 979a6e8e34..979a6e8e34 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
index 902fd823cd..902fd823cd 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
index ad149e3e4f..ad149e3e4f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
index 42f9e74a27..42f9e74a27 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
index fa05e2d7bd..fa05e2d7bd 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
index 92578af219..92578af219 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
index 48c34ba74f..48c34ba74f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
index c9a3f1da79..c9a3f1da79 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
index 6e57ad41de..6e57ad41de 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
index 6f34fc0b7c..6f34fc0b7c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
index 2ad969e1a6..2ad969e1a6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
index a47e1f4e55..a47e1f4e55 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
index 8eac326019..8eac326019 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
index 60fb23be02..60fb23be02 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
index fbcd041621..fbcd041621 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
index aa9180dcd7..aa9180dcd7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
index 38cf9e9467..38cf9e9467 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
index 49a4259333..49a4259333 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
index 74d10fe02d..74d10fe02d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
index 2ee9320f20..2ee9320f20 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
index 9d06dfea97..9d06dfea97 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
index 39050d158c..39050d158c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
index 97834ea0a9..97834ea0a9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
index 047c5e9a58..047c5e9a58 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
index 25f92c38c2..25f92c38c2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
index 8145c6b170..8145c6b170 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
index 000f6690c7..000f6690c7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
index aca5c70641..aca5c70641 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
index 04ee132b3e..04ee132b3e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
index daac727cb6..daac727cb6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
index f780514eda..f780514eda 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
index 42ccd5cdac..42ccd5cdac 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java