Official Tuscany 2.0.1 Release

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

286 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/pom.xml
index 626f0d1352..626f0d1352 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java
index ef2565b750..ef2565b750 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java
index 96a0f2dadd..96a0f2dadd 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java
index f2b7b1e41d..f2b7b1e41d 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java
index a6e80c9eca..a6e80c9eca 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java
index 0fe30c9d53..0fe30c9d53 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java
index 8783808334..8783808334 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java
index 050d35007b..050d35007b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java
index 6c432a500a..6c432a500a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java
index 3573eea978..3573eea978 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite
index b04cc33023..b04cc33023 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite
index fe282d291c..fe282d291c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
index 9efa1a99ec..9efa1a99ec 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
index efa84e92a5..efa84e92a5 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
index 45d28140b4..45d28140b4 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
index a5d6529895..a5d6529895 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
index f7ab3dfe98..f7ab3dfe98 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
index 3d25d37708..3d25d37708 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
index a469d197d6..a469d197d6 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
index 3f5a21fddd..3f5a21fddd 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
index 49e5232b31..49e5232b31 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
index ccc77c142b..ccc77c142b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
index c2be798d1a..c2be798d1a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
index 9355aece1f..9355aece1f 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
index efc47aa94d..efc47aa94d 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
index 6ed813ff0a..6ed813ff0a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
index ba70573efb..ba70573efb 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
index a87d6eb49a..a87d6eb49a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
index 3dc0b12b82..3dc0b12b82 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
index b15d6dea80..b15d6dea80 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
index c4347b084a..c4347b084a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
index 846bff02e1..846bff02e1 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
index d69f442879..d69f442879 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
index cbcc06056a..cbcc06056a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
index dccd2dace8..dccd2dace8 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
index 7aac95a8ff..7aac95a8ff 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
index f748beb6cb..f748beb6cb 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java
index 7c4cf4b0b7..7c4cf4b0b7 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java
index 017acee582..017acee582 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java
index 86f984e61a..86f984e61a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java
index 8e19fd7382..8e19fd7382 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java
index b0d623e2e4..b0d623e2e4 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java
index ccb44694d9..ccb44694d9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java
index 5c8bb13f43..5c8bb13f43 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
index 1ff1792bb7..1ff1792bb7 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
index b17d8e2016..b17d8e2016 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java
index e230326f5f..e230326f5f 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java
index 77df8c2c39..77df8c2c39 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java
index 8effa3ac36..8effa3ac36 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
index 2467ddab88..2467ddab88 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
index d1b75d0a2c..d1b75d0a2c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java
index 44e7efc668..44e7efc668 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
index 88440de023..88440de023 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java
index 06dc2c3f79..06dc2c3f79 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
index fcd0d39162..fcd0d39162 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java
index 7255697d4b..7255697d4b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java
index 51fafae32c..51fafae32c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java
index b8ff0c58ba..b8ff0c58ba 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java
index 633e1a767c..633e1a767c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java
index 1cba2b57c2..1cba2b57c2 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java
index c0960ffe95..c0960ffe95 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/HelloWorld.composite
index 8c825ca805..8c825ca805 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/HelloWorld.composite
index 79b1a5d794..79b1a5d794 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/HelloWorld.composite
index e8924d2728..e8924d2728 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/HelloWorld.composite
index 4edc8df5cd..4edc8df5cd 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorld.composite
index 823cab4f56..823cab4f56 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
index 088fd616f4..088fd616f4 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorld.composite
index 454e9c55cf..454e9c55cf 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
index a313fb8f68..a313fb8f68 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/HelloWorld.composite
index 4151749523..4151749523 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/HelloWorld.composite
index 37af7625ff..37af7625ff 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/HelloWorld.composite
index e797a0aa9c..e797a0aa9c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/HelloWorld.composite
index 079ee49380..079ee49380 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/HelloWorld.composite
index 1d5630f3d0..1d5630f3d0 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/HelloWorld.composite
index ded3766d49..ded3766d49 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorld.composite
index 4513f21acf..4513f21acf 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
index 22c20ff94a..22c20ff94a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorld.composite
index e6a7d776c9..e6a7d776c9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorldComponent.composite
index 0393280625..0393280625 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/HelloWorld.composite
index f4d2789ff7..f4d2789ff7 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/HelloWorld.composite
index 7e6311a22d..7e6311a22d 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/pom.xml
index a7ae8ed797..a7ae8ed797 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java
index ef2565b750..ef2565b750 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java
index 96a0f2dadd..96a0f2dadd 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java
index f2b7b1e41d..f2b7b1e41d 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java
index a6e80c9eca..a6e80c9eca 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java
index 0fe30c9d53..0fe30c9d53 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java
index 8783808334..8783808334 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java
index 050d35007b..050d35007b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java
index 6c432a500a..6c432a500a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java
index 3573eea978..3573eea978 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite
index b04cc33023..b04cc33023 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite
index fe282d291c..fe282d291c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
index 9efa1a99ec..9efa1a99ec 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
index efa84e92a5..efa84e92a5 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
index 45d28140b4..45d28140b4 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
index a5d6529895..a5d6529895 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
index f7ab3dfe98..f7ab3dfe98 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
index 3d25d37708..3d25d37708 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
index a469d197d6..a469d197d6 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
index 3f5a21fddd..3f5a21fddd 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
index 49e5232b31..49e5232b31 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
index ccc77c142b..ccc77c142b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
index c2be798d1a..c2be798d1a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
index 9355aece1f..9355aece1f 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
index efc47aa94d..efc47aa94d 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
index 6ed813ff0a..6ed813ff0a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
index ba70573efb..ba70573efb 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
index a87d6eb49a..a87d6eb49a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
index 3dc0b12b82..3dc0b12b82 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
index b15d6dea80..b15d6dea80 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
index c4347b084a..c4347b084a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
index 846bff02e1..846bff02e1 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
index d69f442879..d69f442879 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
index cbcc06056a..cbcc06056a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
index dccd2dace8..dccd2dace8 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
index 7aac95a8ff..7aac95a8ff 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
index f748beb6cb..f748beb6cb 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java
index 7c4cf4b0b7..7c4cf4b0b7 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java
index 017acee582..017acee582 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java
index 86f984e61a..86f984e61a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java
index 8e19fd7382..8e19fd7382 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java
index b0d623e2e4..b0d623e2e4 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java
index ccb44694d9..ccb44694d9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java
index 5c8bb13f43..5c8bb13f43 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
index 1ff1792bb7..1ff1792bb7 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
index b17d8e2016..b17d8e2016 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java
index e230326f5f..e230326f5f 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java
index 77df8c2c39..77df8c2c39 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java
index 8effa3ac36..8effa3ac36 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
index 2467ddab88..2467ddab88 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
index d1b75d0a2c..d1b75d0a2c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java
index 44e7efc668..44e7efc668 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
index 88440de023..88440de023 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java
index 06dc2c3f79..06dc2c3f79 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
index 05a8c3455c..05a8c3455c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java
index 7255697d4b..7255697d4b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java
index 51fafae32c..51fafae32c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java
index b8ff0c58ba..b8ff0c58ba 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java
index 633e1a767c..633e1a767c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java
index 1cba2b57c2..1cba2b57c2 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java
index c0960ffe95..c0960ffe95 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/HelloWorld.composite
index 8c825ca805..8c825ca805 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/HelloWorld.composite
index 79b1a5d794..79b1a5d794 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/HelloWorld.composite
index e8924d2728..e8924d2728 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/HelloWorld.composite
index 4edc8df5cd..4edc8df5cd 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorld.composite
index 823cab4f56..823cab4f56 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
index 54fb359ba0..54fb359ba0 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorld.composite
index 454e9c55cf..454e9c55cf 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
index a313fb8f68..a313fb8f68 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/HelloWorld.composite
index 4151749523..4151749523 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/HelloWorld.composite
index 37af7625ff..37af7625ff 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/HelloWorld.composite
index e797a0aa9c..e797a0aa9c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/HelloWorld.composite
index 079ee49380..079ee49380 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/HelloWorld.composite
index 1d5630f3d0..1d5630f3d0 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/HelloWorld.composite
index ded3766d49..ded3766d49 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorld.composite
index 4513f21acf..4513f21acf 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
index 22c20ff94a..22c20ff94a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorld.composite
index e6a7d776c9..e6a7d776c9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorldComponent.composite
index 0393280625..0393280625 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/HelloWorld.composite
index f4d2789ff7..f4d2789ff7 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/HelloWorld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/HelloWorld.composite
index 7e6311a22d..7e6311a22d 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/domain-node/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/domain-node/pom.xml
index f2733b7b7d..f2733b7b7d 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/domain-node/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/domain-node/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldClientImpl.java
index 021a653c36..021a653c36 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldImpl.java
index 636f7699ed..636f7699ed 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldService.java
index 32c2d0b907..32c2d0b907 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/domain-node/src/main/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/domain-node/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/domain-node/src/main/resources/META-INF/sca-contribution.xml
index 34da25216d..34da25216d 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/domain-node/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/domain-node/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/domain-node/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/domain-node/src/main/resources/helloworld.composite
index fae44b642d..fae44b642d 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/domain-node/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/domain-node/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/domain-node/src/test/java/helloworld/DomainNodeTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/domain-node/src/test/java/helloworld/DomainNodeTestCase.java
index 028db4cf33..028db4cf33 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/domain-node/src/test/java/helloworld/DomainNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/domain-node/src/test/java/helloworld/DomainNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-client/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-client/pom.xml
index f2144e3ded..f2144e3ded 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-client/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
index 2619dc269b..2619dc269b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml
index e295015a40..e295015a40 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
index 3c4ed03448..3c4ed03448 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-iface/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-iface/pom.xml
index 904b84e2a9..904b84e2a9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-iface/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-iface/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
index a0710281c9..a0710281c9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-iface/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-iface/src/main/resources/META-INF/sca-contribution.xml
index 2205b4e8fe..2205b4e8fe 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-iface/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-iface/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-a/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-a/pom.xml
index 0b767c15b0..0b767c15b0 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-a/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-a/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-a/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-a/src/main/java/itest/nodes/HelloworldImpl.java
index 2619dc269b..2619dc269b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-a/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-a/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-a/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-a/src/main/resources/META-INF/sca-contribution.xml
index bba92e6ca3..bba92e6ca3 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-a/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-a/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-a/src/main/resources/service-a.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-a/src/main/resources/service-a.composite
index 55122d2d6c..55122d2d6c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-a/src/main/resources/service-a.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-a/src/main/resources/service-a.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-and-client/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-and-client/pom.xml
index 34a0be500a..34a0be500a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-and-client/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-and-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/Helloworld.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/Helloworld.java
index f08412d4bf..f08412d4bf 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/Helloworld.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldClientImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldClientImpl.java
index d64536a998..d64536a998 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldClientImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldServiceImpl.java
index 728804b08c..728804b08c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-and-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-and-client/src/main/resources/META-INF/sca-contribution.xml
index 555824a94e..555824a94e 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-and-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-and-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-and-client/src/main/resources/helloworld-service.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-and-client/src/main/resources/helloworld-service.composite
index 38ac479275..38ac479275 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-and-client/src/main/resources/helloworld-service.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-and-client/src/main/resources/helloworld-service.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-b/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-b/pom.xml
index 7a021816cc..7a021816cc 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-b/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-b/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-b/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-b/src/main/java/itest/nodes/HelloworldImpl.java
index b1d5a8235a..b1d5a8235a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-b/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-b/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-b/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-b/src/main/resources/META-INF/sca-contribution.xml
index 4405cca18e..4405cca18e 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-b/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-b/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-b/src/main/resources/service-b.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-b/src/main/resources/service-b.composite
index 02cff882a7..02cff882a7 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-b/src/main/resources/service-b.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-b/src/main/resources/service-b.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-c/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-c/pom.xml
index 55bf576501..55bf576501 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-c/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-c/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-c/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-c/src/main/java/itest/nodes/HelloworldImpl.java
index 81f7e1747d..81f7e1747d 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-c/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-c/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-c/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-c/src/main/resources/META-INF/sca-contribution.xml
index 3ff86f946b..3ff86f946b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-c/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-c/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-c/src/main/resources/service-c.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-c/src/main/resources/service-c.composite
index d88db09b43..d88db09b43 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service-c/src/main/resources/service-c.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service-c/src/main/resources/service-c.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service/pom.xml
index cd4f429976..cd4f429976 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
index a27e752fd7..a27e752fd7 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml
index b02141ef26..b02141ef26 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
index 5334caeb55..5334caeb55 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml
index b5f8ca81f8..b5f8ca81f8 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java
index 1e59e3e34e..1e59e3e34e 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-hazelcast/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-hazelcast/pom.xml
index befaa40d92..befaa40d92 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-hazelcast/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-hazelcast/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeOneContributionTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeOneContributionTestCase.java
index 3755d0b365..3755d0b365 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeOneContributionTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeOneContributionTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java
index c8ae6f3762..c8ae6f3762 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java
index 23c4a62916..23c4a62916 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
index a7e2bcf1c1..a7e2bcf1c1 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-tribes/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-tribes/pom.xml
index 4b23d1336c..4b23d1336c 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-tribes/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-tribes/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java
index e55e8f63e4..e55e8f63e4 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java
index 2d920c340a..2d920c340a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
index 888b4df156..888b4df156 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm/pom.xml
index ab660730d0..ab660730d0 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java
index c8ae6f3762..c8ae6f3762 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java
index 23c4a62916..23c4a62916 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-node-test/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-node-test/pom.xml
index 5132f9065a..5132f9065a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-node-test/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-node-test/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
index 93f5863010..93f5863010 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/pom.xml
index 06dd6b86eb..06dd6b86eb 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/remote-stop-start/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/remote-stop-start/pom.xml
index ec5477e235..ec5477e235 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/remote-stop-start/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/remote-stop-start/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/remote-stop-start/src/main/java/itest/HelloworldService.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/remote-stop-start/src/main/java/itest/HelloworldService.java
index f97d2c3a83..f97d2c3a83 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/remote-stop-start/src/main/java/itest/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/remote-stop-start/src/main/java/itest/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/remote-stop-start/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/remote-stop-start/src/main/java/itest/HelloworldServiceImpl.java
index 4fd909af82..4fd909af82 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/remote-stop-start/src/main/java/itest/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/remote-stop-start/src/main/java/itest/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/remote-stop-start/src/main/java/itest/RemoteHelloworldService.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/remote-stop-start/src/main/java/itest/RemoteHelloworldService.java
index d5b9dcf311..d5b9dcf311 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/remote-stop-start/src/main/java/itest/RemoteHelloworldService.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/remote-stop-start/src/main/java/itest/RemoteHelloworldService.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/remote-stop-start/src/main/resources/Helloworld.composite b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/remote-stop-start/src/main/resources/Helloworld.composite
index d37c93857d..d37c93857d 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/remote-stop-start/src/main/resources/Helloworld.composite
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/remote-stop-start/src/main/resources/Helloworld.composite
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/remote-stop-start/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/remote-stop-start/src/main/resources/META-INF/sca-contribution.xml
index e178823296..e178823296 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/remote-stop-start/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/remote-stop-start/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/remote-stop-start/src/test/java/test/scaclient/StopStartTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/remote-stop-start/src/test/java/test/scaclient/StopStartTestCase.java
index 933b9f1bea..933b9f1bea 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/remote-stop-start/src/test/java/test/scaclient/StopStartTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/remote-stop-start/src/test/java/test/scaclient/StopStartTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/build.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/build.xml
index 3d77230541..3d77230541 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/build.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/build.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/client.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/client.xml
index 8e7c744940..8e7c744940 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/client.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/client.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/pom.xml
index df9593dc53..df9593dc53 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/server.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/server.xml
index dc18cc8ce0..dc18cc8ce0 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/server.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/server.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/service-a-config.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/service-a-config.xml
index d4c8909126..d4c8909126 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/service-a-config.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/service-a-config.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/service-b-config.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/service-b-config.xml
index d557a31b64..d557a31b64 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/service-b-config.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/service-b-config.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/service-c-config.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/service-c-config.xml
index ba642c5ed0..ba642c5ed0 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/service-c-config.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/service-c-config.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceA.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceA.java
index 6ef30fe43f..6ef30fe43f 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceA.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceA.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceB.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceB.java
index 67a8e5d92e..67a8e5d92e 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceB.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceB.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceC.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceC.java
index d716b5cd98..d716b5cd98 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceC.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceC.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-jvm-hazelcast/build.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-jvm-hazelcast/build.xml
index 7e83ff658e..7e83ff658e 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-jvm-hazelcast/build.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-jvm-hazelcast/build.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-jvm-hazelcast/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-jvm-hazelcast/pom.xml
index f40977406d..f40977406d 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-jvm-hazelcast/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-jvm-hazelcast/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-jvm-hazelcast/src/main/java/org/apache/tuscany/sca/impl/Tuscany.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-jvm-hazelcast/src/main/java/org/apache/tuscany/sca/impl/Tuscany.java
index 5c6ca7476e..5c6ca7476e 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-jvm-hazelcast/src/main/java/org/apache/tuscany/sca/impl/Tuscany.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-jvm-hazelcast/src/main/java/org/apache/tuscany/sca/impl/Tuscany.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-client-contribution.jar b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-client-contribution.jar
index c98214fc83..c98214fc83 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-client-contribution.jar
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-client-contribution.jar
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-iface-contribution.jar b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-iface-contribution.jar
index 455de9c58a..455de9c58a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-iface-contribution.jar
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-iface-contribution.jar
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-service-contribution.jar b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-service-contribution.jar
index 28e3e680e9..28e3e680e9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-service-contribution.jar
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-service-contribution.jar
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/node-nodeClient/node.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/node-nodeClient/node.xml
index 81f82a9590..81f82a9590 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/node-nodeClient/node.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/node-nodeClient/node.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/node-nodeService/node.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/node-nodeService/node.xml
index 5d8620498a..5d8620498a 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/node-nodeService/node.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/node-nodeService/node.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-test/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-test/pom.xml
index 02a0b19533..02a0b19533 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-test/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-test/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
index 6da4c1f7e1..6da4c1f7e1 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
index 4b034d89e0..4b034d89e0 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java
index 998492734b..998492734b 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java
index 7dfa6e66cc..7dfa6e66cc 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
index 80c36e5ee9..80c36e5ee9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-two-vms-test/build.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-two-vms-test/build.xml
index fa7e963e87..fa7e963e87 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-two-vms-test/build.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-two-vms-test/build.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-two-vms-test/client-config.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-two-vms-test/client-config.xml
index 3800a5e338..3800a5e338 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-two-vms-test/client-config.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-two-vms-test/client-config.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-two-vms-test/client.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-two-vms-test/client.xml
index 8e7c744940..8e7c744940 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-two-vms-test/client.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-two-vms-test/client.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-two-vms-test/pom.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-two-vms-test/pom.xml
index bad670d99e..bad670d99e 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-two-vms-test/pom.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-two-vms-test/pom.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-two-vms-test/server-config.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-two-vms-test/server-config.xml
index 590cf3bddb..590cf3bddb 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-two-vms-test/server-config.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-two-vms-test/server-config.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-two-vms-test/server.xml b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-two-vms-test/server.xml
index 05a5aa16e9..05a5aa16e9 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-two-vms-test/server.xml
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-two-vms-test/server.xml
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
index eef3362c10..eef3362c10 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java
index 7323c2c122..7323c2c122 100644
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java
+++ b/sca-java-2.x/tags/2.0.1/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java