1874 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/T3558/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/T3558/pom.xml
index 24b953f804..24b953f804 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/T3558/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/T3558/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/T3558/src/test/java/org/apache/tuscany/sca/itest/t3558/T3558TestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/T3558/src/test/java/org/apache/tuscany/sca/itest/t3558/T3558TestCase.java
index 5bb860ef89..5bb860ef89 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/T3558/src/test/java/org/apache/tuscany/sca/itest/t3558/T3558TestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/T3558/src/test/java/org/apache/tuscany/sca/itest/t3558/T3558TestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/T3558/src/test/resources/sample-store-all.jar b/sca-java-2.x/tags/2.0-Beta3/testing/itest/T3558/src/test/resources/sample-store-all.jar
index 6f3649ff23..6f3649ff23 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/T3558/src/test/resources/sample-store-all.jar
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/T3558/src/test/resources/sample-store-all.jar
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/T3558/src/test/resources/sample-store-client.jar b/sca-java-2.x/tags/2.0-Beta3/testing/itest/T3558/src/test/resources/sample-store-client.jar
index 5dfecda310..5dfecda310 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/T3558/src/test/resources/sample-store-client.jar
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/T3558/src/test/resources/sample-store-client.jar
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/T3558/src/test/resources/sample-store.jar b/sca-java-2.x/tags/2.0-Beta3/testing/itest/T3558/src/test/resources/sample-store.jar
index 98e1f6ebb4..98e1f6ebb4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/T3558/src/test/resources/sample-store.jar
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/T3558/src/test/resources/sample-store.jar
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/pom.xml
index d2475322d9..d2475322d9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/client/CreditCardClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/client/CreditCardClient.java
index 31a9bc3f9c..31a9bc3f9c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/client/CreditCardClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/client/CreditCardClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentCallback.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentCallback.java
index 648f30d804..648f30d804 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentCallback.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentCallback.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentCallbackSync.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentCallbackSync.java
index 801effa734..801effa734 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentCallbackSync.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentCallbackSync.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentClientImpl.java
index 69a6203045..69a6203045 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentRequestClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentRequestClient.java
index fe0e99cd50..fe0e99cd50 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentRequestClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentRequestClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentRequestClientSync.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentRequestClientSync.java
index 52f5014af0..52f5014af0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentRequestClientSync.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/client/CreditCardPaymentRequestClientSync.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/server/CreditCardPaymentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/server/CreditCardPaymentImpl.java
index 8d946b5723..8d946b5723 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/server/CreditCardPaymentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/server/CreditCardPaymentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/server/CreditCardPaymentRequestServer.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/server/CreditCardPaymentRequestServer.java
index f257e5a0ee..f257e5a0ee 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/server/CreditCardPaymentRequestServer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/server/CreditCardPaymentRequestServer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/server/CreditCardPaymentRequestServerSync.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/server/CreditCardPaymentRequestServerSync.java
index 93351c0f89..93351c0f89 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/java/test/server/CreditCardPaymentRequestServerSync.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/java/test/server/CreditCardPaymentRequestServerSync.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/resources/jndi.properties
index 324132604b..324132604b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/resources/test/client/creditcard-client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/resources/test/client/creditcard-client.composite
index 92a802fff3..92a802fff3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/resources/test/client/creditcard-client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/resources/test/client/creditcard-client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/resources/wsdl/creditcard-client.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/resources/wsdl/creditcard-client.xml
index edf8f375bc..edf8f375bc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/resources/wsdl/creditcard-client.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/resources/wsdl/creditcard-client.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/resources/wsdl/creditcard-server.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/resources/wsdl/creditcard-server.xml
index 9f39e164b2..9f39e164b2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/resources/wsdl/creditcard-server.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/resources/wsdl/creditcard-server.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/resources/wsdl/creditcard.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/resources/wsdl/creditcard.wsdl
index 93988329cb..93988329cb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/main/resources/wsdl/creditcard.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/main/resources/wsdl/creditcard.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/test/java/itest/CreditCardTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/test/java/itest/CreditCardTestCase.java
index d9b82175cc..d9b82175cc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-interactions/src/test/java/itest/CreditCardTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-interactions/src/test/java/itest/CreditCardTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/pom.xml
index d4140f9d58..d4140f9d58 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/ASM_0002_Client.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/ASM_0002_Client.java
index 2fb9c069ad..2fb9c069ad 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/ASM_0002_Client.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/ASM_0002_Client.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/BusinessFault1.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/BusinessFault1.java
index 01446c88e5..01446c88e5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/BusinessFault1.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/BusinessFault1.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/BusinessFault2.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/BusinessFault2.java
index 7f9d965820..7f9d965820 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/BusinessFault2.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/BusinessFault2.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/Service1.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/Service1.java
index 84ba75e0e2..84ba75e0e2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/Service1.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/Service1.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/Service1AsyncServer.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/Service1AsyncServer.java
index 1500cbdb07..1500cbdb07 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/Service1AsyncServer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/Service1AsyncServer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/Service1AsyncServerImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/Service1AsyncServerImpl.java
index e4e17ca860..e4e17ca860 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/Service1AsyncServerImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/Service1AsyncServerImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/TestException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/TestException.java
index 1de688dfcd..1de688dfcd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/TestException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/TestException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/TestInvocation.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/TestInvocation.java
index 5b624d4712..5b624d4712 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/TestInvocation.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/java/org/apache/tuscany/sca/itest/TestInvocation.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/resources/TestClient.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/resources/TestClient.wsdl
index 92cabda65d..92cabda65d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/resources/TestClient.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/resources/TestClient.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/resources/TestInvocation.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/resources/TestInvocation.wsdl
index a1030a4881..a1030a4881 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/resources/TestInvocation.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/resources/TestInvocation.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/resources/Test_Async_001.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/resources/Test_Async_001.composite
index 5c51f4a7b6..5c51f4a7b6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/resources/Test_Async_001.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/resources/Test_Async_001.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/resources/Test_Async_002.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/resources/Test_Async_002.composite
index 1eee9501d6..1eee9501d6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/resources/Test_Async_002.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/resources/Test_Async_002.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/resources/Test_Async_003.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/resources/Test_Async_003.composite
index ae56034ccf..ae56034ccf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/main/resources/Test_Async_003.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/main/resources/Test_Async_003.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/test/java/org/apache/tuscany/sca/itest/Async_001_TestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/test/java/org/apache/tuscany/sca/itest/Async_001_TestCase.java
index 27ff4da34b..27ff4da34b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/test/java/org/apache/tuscany/sca/itest/Async_001_TestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/test/java/org/apache/tuscany/sca/itest/Async_001_TestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/test/java/org/apache/tuscany/sca/itest/Async_002_TestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/test/java/org/apache/tuscany/sca/itest/Async_002_TestCase.java
index d18b8d3b73..d18b8d3b73 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/test/java/org/apache/tuscany/sca/itest/Async_002_TestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/test/java/org/apache/tuscany/sca/itest/Async_002_TestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/test/java/org/apache/tuscany/sca/itest/Async_003_TestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/test/java/org/apache/tuscany/sca/itest/Async_003_TestCase.java
index fafe522da8..fafe522da8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/async-services/src/test/java/org/apache/tuscany/sca/itest/Async_003_TestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/async-services/src/test/java/org/apache/tuscany/sca/itest/Async_003_TestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/base/dependencies/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/base/dependencies/pom.xml
index fa988b2a0a..fa988b2a0a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/base/dependencies/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/base/dependencies/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java
index c17b495d50..c17b495d50 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/base/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/base/pom.xml
index 19ed9f4072..19ed9f4072 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/base/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/base/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/pom.xml
index 04f890193b..04f890193b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
index d7dff093f9..d7dff093f9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
index 5ecf5494be..5ecf5494be 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
index 24ab0a4181..24ab0a4181 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
index f46893481b..f46893481b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
index a687534bb2..a687534bb2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
index a9268ac1b5..a9268ac1b5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
index d3cfb80547..d3cfb80547 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
index b976a53970..b976a53970 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
index c0317687df..c0317687df 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
index ef66d28bb9..ef66d28bb9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
index 541a713112..541a713112 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/resources/log4j.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
index 4e13380e0b..4e13380e0b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-ws/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-ws/pom.xml
index ef479b5e4d..ef479b5e4d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-ws/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-ws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
index 0999e97065..0999e97065 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
index 315591fb98..315591fb98 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
index e606e6dd52..e606e6dd52 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
index 610bda3cc4..610bda3cc4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-ws/src/test/resources/log4j.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
index 37f66e4189..37f66e4189 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld/pom.xml
index c1c581da59..c1c581da59 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
index 0999e97065..0999e97065 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
index cbed39c295..cbed39c295 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
index 156e32e9ee..156e32e9ee 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
index 96ec8b24b7..96ec8b24b7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
index c77318e8fd..c77318e8fd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld/src/test/resources/log4j.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld/src/test/resources/log4j.properties
index 37f66e4189..37f66e4189 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/helloworld/src/test/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/helloworld/src/test/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/pom.xml
index 825c5f727b..825c5f727b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/bpel/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/pom.xml
index 3dd6e32292..3dd6e32292 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
index b0dc7a6389..b0dc7a6389 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
index bf73a64027..bf73a64027 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
index 6f36b1c55a..6f36b1c55a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
index 8c5c5de208..8c5c5de208 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
index f4b8d2cf39..f4b8d2cf39 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
index 299f7606e3..299f7606e3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
index 7fabed9436..7fabed9436 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario1/scenario1.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario1/scenario1.composite
index 286e53539f..286e53539f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario1/scenario1.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario1/scenario1.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario1/scenario1a.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario1/scenario1a.composite
index 2bdfc19c3c..2bdfc19c3c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario1/scenario1a.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario1/scenario1a.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
index ac01b3c687..ac01b3c687 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario10/scenario10.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario10/scenario10.composite
index 2d127a7bec..2d127a7bec 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario10/scenario10.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario10/scenario10.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario10/scenario10a.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario10/scenario10a.composite
index 0fda11482b..0fda11482b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario10/scenario10a.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario10/scenario10a.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario10/service3.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario10/service3.wsdl
index 2477e23dc6..2477e23dc6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario10/service3.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario10/service3.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
index 8b82b43c68..8b82b43c68 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario11/scenario11.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario11/scenario11.composite
index 2f5ca96d07..2f5ca96d07 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario11/scenario11.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario11/scenario11.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario11/scenario11a.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario11/scenario11a.composite
index 1831d97ea7..1831d97ea7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario11/scenario11a.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario11/scenario11a.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario11/service3.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario11/service3.wsdl
index 2477e23dc6..2477e23dc6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario11/service3.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario11/service3.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
index 4028098023..4028098023 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario12/scenario12.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario12/scenario12.composite
index 23799f8487..23799f8487 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario12/scenario12.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario12/scenario12.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario12/scenario12a.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario12/scenario12a.composite
index 7982a9b2d7..7982a9b2d7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario12/scenario12a.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario12/scenario12a.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
index 1da59d5f04..1da59d5f04 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario13/scenario13.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario13/scenario13.composite
index 631e38855f..631e38855f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario13/scenario13.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario13/scenario13.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario13/scenario13a.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario13/scenario13a.composite
index a6e31ea5e2..a6e31ea5e2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario13/scenario13a.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario13/scenario13a.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
index b51ef11b05..b51ef11b05 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario2/scenario2.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario2/scenario2.composite
index 2fa559e1ed..2fa559e1ed 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario2/scenario2.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario2/scenario2.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario2/scenario2a.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario2/scenario2a.composite
index 9fd3df07e8..9fd3df07e8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario2/scenario2a.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario2/scenario2a.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
index 22950dfe03..22950dfe03 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario3/scenario3.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario3/scenario3.composite
index 84f42c60fc..84f42c60fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario3/scenario3.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario3/scenario3.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario3/scenario3a.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario3/scenario3a.composite
index 89fa0619e4..89fa0619e4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario3/scenario3a.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario3/scenario3a.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
index a17e27c9d8..a17e27c9d8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario4/scenario4.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario4/scenario4.composite
index a0bdb0197d..a0bdb0197d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario4/scenario4.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario4/scenario4.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario4/scenario4a.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario4/scenario4a.composite
index fbf1b1a893..fbf1b1a893 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario4/scenario4a.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario4/scenario4a.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
index 83a232db6e..83a232db6e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario5/scenario5.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario5/scenario5.composite
index 2326afd2f2..2326afd2f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario5/scenario5.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario5/scenario5.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario5/scenario5a.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario5/scenario5a.composite
index 802d82b0f3..802d82b0f3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario5/scenario5a.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario5/scenario5a.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario5/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario5/scenarios.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario5/scenarios.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
index fb477d3e62..fb477d3e62 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario6/scenario6.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario6/scenario6.composite
index dadfc7eb82..dadfc7eb82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario6/scenario6.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario6/scenario6.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario6/scenario6a.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario6/scenario6a.composite
index 0c94b2bf06..0c94b2bf06 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario6/scenario6a.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario6/scenario6a.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario6/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario6/scenarios.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario6/scenarios.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
index ede31d6bee..ede31d6bee 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario7/scenario7.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario7/scenario7.composite
index e1d2e0cefe..e1d2e0cefe 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario7/scenario7.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario7/scenario7.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario7/scenario7a.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario7/scenario7a.composite
index 76892f1515..76892f1515 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario7/scenario7a.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario7/scenario7a.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario7/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario7/scenarios.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario7/scenarios.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
index 7bb9e694a3..7bb9e694a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario8/scenario8.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario8/scenario8.composite
index 467b7f57fa..467b7f57fa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario8/scenario8.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario8/scenario8.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario8/scenario8a.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario8/scenario8a.composite
index 86cf093f94..86cf093f94 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario8/scenario8a.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario8/scenario8a.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario8/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario8/scenarios.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario8/scenarios.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
index b6ec160506..b6ec160506 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario9/scenario9.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario9/scenario9.composite
index 83584ed482..83584ed482 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario9/scenario9.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario9/scenario9.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario9/scenario9a.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario9/scenario9a.composite
index 2861974c98..2861974c98 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/main/resources/scenario9/scenario9a.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/main/resources/scenario9/scenario9a.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
index b0c9f7728a..b0c9f7728a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
index 897cd21e8a..897cd21e8a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
index 9a5aa5582d..9a5aa5582d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/pom.xml
index 5d4b04b37f..5d4b04b37f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
index b013462f9f..b013462f9f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
index 252e4dc45f..252e4dc45f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
index d883dc2d6f..d883dc2d6f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
index afb7c45e2c..afb7c45e2c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
index 44f57b4316..44f57b4316 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/src/main/resources/CallBackApiTest.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/src/main/resources/CallBackApiTest.composite
index a67233665c..a67233665c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/src/main/resources/CallBackApiTest.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/src/main/resources/CallBackApiTest.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
index b1a01e9f7b..b1a01e9f7b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
index 75fab95efb..75fab95efb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/pom.xml
index ddd9b3dde3..ddd9b3dde3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 291a72b9d6..291a72b9d6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 19f366c423..19f366c423 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index 4bb6b29a8d..4bb6b29a8d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index 5396879e83..5396879e83 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 07010f61e1..07010f61e1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
index 5339e9952e..5339e9952e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
index d36d7478e2..d36d7478e2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
index 43b812faed..43b812faed 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/pom.xml
index 52799d695d..52799d695d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
index 627d37e27d..627d37e27d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
index 966ad17b9a..966ad17b9a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
index d2dc0add75..d2dc0add75 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
index 32ab1bdd3e..32ab1bdd3e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
index f7a1a195ed..f7a1a195ed 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
index 9730c294d6..9730c294d6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
index 11e748675d..11e748675d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java
index dde489d766..dde489d766 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/pom.xml
index b3f7762e26..b3f7762e26 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
index 7c80d222fc..7c80d222fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
index c3ea6c3032..c3ea6c3032 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
index 84ca158c97..84ca158c97 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
index 66758a1e73..66758a1e73 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
index f198efae51..f198efae51 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
index 2b484293c7..2b484293c7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
index 9fe62ac671..9fe62ac671 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
index bd3cce74b4..bd3cce74b4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-separatethread/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-separatethread/pom.xml
index d15258b3a1..d15258b3a1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-separatethread/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-separatethread/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
index dc66003604..dc66003604 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
index f03144db8a..f03144db8a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
index 137ea6a658..137ea6a658 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
index 4bf05fc925..4bf05fc925 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
index 0805b96875..0805b96875 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
index b10f3bc771..b10f3bc771 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
index c216cab1be..c216cab1be 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/pom.xml
index b58941113c..b58941113c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 291a72b9d6..291a72b9d6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 19f366c423..19f366c423 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index 4bb6b29a8d..4bb6b29a8d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index 5396879e83..5396879e83 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 07010f61e1..07010f61e1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/main/resources/CallBackReference.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/main/resources/CallBackReference.composite
index 477ef7391f..477ef7391f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/main/resources/CallBackReference.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/main/resources/CallBackReference.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/main/resources/CallBackService.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/main/resources/CallBackService.composite
index c3f0f5bc81..c3f0f5bc81 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/main/resources/CallBackService.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/main/resources/CallBackService.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/main/resources/META-INF/sca-contribution.xml
index 11d737e701..11d737e701 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/test/java/org/apache/tuscany/sca/test/CallBackTwoCompositesTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/test/java/org/apache/tuscany/sca/test/CallBackTwoCompositesTestCase.java
index 92fc8f4bef..92fc8f4bef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-composites/src/test/java/org/apache/tuscany/sca/test/CallBackTwoCompositesTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-composites/src/test/java/org/apache/tuscany/sca/test/CallBackTwoCompositesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/pom.xml
index 0821fcfe11..0821fcfe11 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 291a72b9d6..291a72b9d6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 19f366c423..19f366c423 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index 4bb6b29a8d..4bb6b29a8d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index 5396879e83..5396879e83 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 07010f61e1..07010f61e1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/main/resources/CallBackReference.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/main/resources/CallBackReference.composite
index 477ef7391f..477ef7391f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/main/resources/CallBackReference.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/main/resources/CallBackReference.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/main/resources/CallBackService.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/main/resources/CallBackService.composite
index c3f0f5bc81..c3f0f5bc81 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/main/resources/CallBackService.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/main/resources/CallBackService.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/main/resources/META-INF/sca-contribution.xml
index efef032b8f..efef032b8f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java
index 19e818b68f..19e818b68f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/pom.xml
index 110ce8cdda..110ce8cdda 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/AddService.java
index dd7ecb827d..dd7ecb827d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/CalculatorClient.java
index 6f978bd9be..6f978bd9be 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
index 1209ac128a..1209ac128a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/resources/Calculator.composite
index fc08333544..fc08333544 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
index a6babbfc2f..a6babbfc2f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
index b3a4ac83e9..b3a4ac83e9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
index 9238359f76..9238359f76 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 2fadb54bf1..2fadb54bf1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
index 6ca2df2928..6ca2df2928 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
index ac3ccc3d08..ac3ccc3d08 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/context/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/context/pom.xml
index 1f9dafbc20..1f9dafbc20 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/context/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/context/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/context/src/main/java/itest/helloworld/ApplicationContext.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/context/src/main/java/itest/helloworld/ApplicationContext.java
index 9ddda2e244..9ddda2e244 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/context/src/main/java/itest/helloworld/ApplicationContext.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/context/src/main/java/itest/helloworld/ApplicationContext.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/context/src/main/java/itest/helloworld/Helloworld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/context/src/main/java/itest/helloworld/Helloworld.java
index 5c101ce832..5c101ce832 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/context/src/main/java/itest/helloworld/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/context/src/main/java/itest/helloworld/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/context/src/main/java/itest/helloworld/HelloworldClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/context/src/main/java/itest/helloworld/HelloworldClientImpl.java
index 0ae95d8404..0ae95d8404 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/context/src/main/java/itest/helloworld/HelloworldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/context/src/main/java/itest/helloworld/HelloworldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/context/src/main/java/itest/helloworld/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/context/src/main/java/itest/helloworld/HelloworldServiceImpl.java
index 8cb65789a1..8cb65789a1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/context/src/main/java/itest/helloworld/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/context/src/main/java/itest/helloworld/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/context/src/main/resources/context.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/context/src/main/resources/context.composite
index d29c636f77..d29c636f77 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/context/src/main/resources/context.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/context/src/main/resources/context.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/context/src/test/java/itest/helloworld/ContextTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/context/src/test/java/itest/helloworld/ContextTestCase.java
index 3ba3caf7bc..3ba3caf7bc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/context/src/test/java/itest/helloworld/ContextTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/context/src/test/java/itest/helloworld/ContextTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-folder/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-folder/pom.xml
index 019f88b464..019f88b464 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-folder/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-folder/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-folder/src/test/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
index b4c677b371..b4c677b371 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java
index ef2a43c766..ef2a43c766 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
index 05bea57944..05bea57944 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
index 8d6012e5c4..8d6012e5c4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
index fe264693fe..fe264693fe 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
index d5dfb647d3..d5dfb647d3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-folder/src/test/resources/repository3/contribution.zip b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-folder/src/test/resources/repository3/contribution.zip
index b293aa4bcc..b293aa4bcc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-folder/src/test/resources/repository3/contribution.zip
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-folder/src/test/resources/repository3/contribution.zip
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-composite/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-composite/pom.xml
index 842a7ca47a..842a7ca47a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-composite/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-composite/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
index 669821261c..669821261c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
index ff9f6e75f3..ff9f6e75f3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
index bea6f39932..bea6f39932 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
index 44614f243a..44614f243a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-java/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-java/pom.xml
index a863a7843f..a863a7843f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-java/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-java/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
index 7e11adcec7..7e11adcec7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
index 5a14b41650..5a14b41650 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-resource/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-resource/pom.xml
index d8133c4acc..d8133c4acc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-resource/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-resource/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
index f11eacb416..f11eacb416 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
index 1ff281373a..1ff281373a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-wsdl/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-wsdl/pom.xml
index 7c504aee50..7c504aee50 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-wsdl/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-wsdl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
index 8254b667f2..8254b667f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
index 0172fb2c7c..0172fb2c7c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
index d49e2ead99..d49e2ead99 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/pom.xml
index 7fdc6b68e4..7fdc6b68e4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
index c062afaed0..c062afaed0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
index 130aa91093..130aa91093 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
index 0172fb2c7c..0172fb2c7c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
index d49e2ead99..d49e2ead99 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
index 44ceba1240..44ceba1240 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
index 3cc6784eca..3cc6784eca 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-java/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-java/pom.xml
index a0fac8b806..a0fac8b806 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-java/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-java/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
index 224e2c4d79..224e2c4d79 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
index a53117e72f..a53117e72f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 9bc94525e0..9bc94525e0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-resource/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-resource/pom.xml
index 2cf8245ccb..2cf8245ccb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-resource/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-resource/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
index ac6d7becb3..ac6d7becb3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-resource/src/main/resources/store.composite
index bb5a7b764f..bb5a7b764f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-resource/src/main/resources/store.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-resource/src/main/resources/store.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
index 1b7542b7d9..1b7542b7d9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-wsdl/pom.xml
index a0d1b7d215..a0d1b7d215 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-wsdl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
index a47b9a71e9..a47b9a71e9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
index 76ccf71fb8..76ccf71fb8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 66227eacaa..66227eacaa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/pom.xml
index b3f2309bfe..b3f2309bfe 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-import-export/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-import-export/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-zip/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-zip/pom.xml
index 1cc2031b25..1cc2031b25 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-zip/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-zip/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-zip/src/test/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-zip/src/test/java/calculator/CalculatorService.java
index b4c677b371..b4c677b371 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-zip/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-zip/src/test/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java
index 303e2a6d9a..303e2a6d9a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-zip/src/test/resources/repository/contribution.zip b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-zip/src/test/resources/repository/contribution.zip
index 25476c2206..25476c2206 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/contribution-zip/src/test/resources/repository/contribution.zip
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/contribution-zip/src/test/resources/repository/contribution.zip
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/pom.xml
index 71722965f5..71722965f5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
index 6c362b0062..6c362b0062 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
index da4644057e..da4644057e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
index 4b58fab1f0..4b58fab1f0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
index 3d3efb9c29..3d3efb9c29 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
index 0190df2d1c..0190df2d1c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
index af2c9ea711..af2c9ea711 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
index bd1ce8cb49..bd1ce8cb49 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
index 3639ba812d..3639ba812d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
index abcec43d0e..abcec43d0e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
index 171a7919a2..171a7919a2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
index 5f2dc56033..5f2dc56033 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
index 24a628d406..24a628d406 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
index da37f28e39..da37f28e39 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
index 7b2466f791..7b2466f791 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
index 27052a1549..27052a1549 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
index 57daa51f42..57daa51f42 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
index 88fef0b4fb..88fef0b4fb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
index c5d2aab203..c5d2aab203 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
index db57fc5cba..db57fc5cba 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
index ec25e703c5..ec25e703c5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
index 940b391499..940b391499 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
index 63a11dc56a..63a11dc56a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
index 8c0bfc9e39..8c0bfc9e39 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
index 72ff55a711..72ff55a711 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
index 8a063b8b9d..8a063b8b9d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
index bc42d57ac3..bc42d57ac3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
index 1cb1ed295e..1cb1ed295e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
index e2221541c5..e2221541c5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
index 13f294b871..13f294b871 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
index 66cc1d1e82..66cc1d1e82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
index f14394b400..f14394b400 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
index 56388624d7..56388624d7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
index 1897d0682c..1897d0682c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
index c8c88ef91d..c8c88ef91d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
index 5540b98c21..5540b98c21 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
index 648144299c..648144299c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
index b57e098a56..b57e098a56 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
index 8ddfa10575..8ddfa10575 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
index 9717629711..9717629711 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
index 1247b4618d..1247b4618d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
index f2cc3adad5..f2cc3adad5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
index dbad550222..dbad550222 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
index d29129236c..d29129236c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
index 837ba04cea..837ba04cea 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
index 0b24056642..0b24056642 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
index e2ed1ab037..e2ed1ab037 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
index 46888399ed..46888399ed 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
index c276038050..c276038050 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
index 079a56b446..079a56b446 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
index 0407184598..0407184598 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
index 16e099cfa3..16e099cfa3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
index b4883cb35c..b4883cb35c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
index c96fb61204..c96fb61204 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
index 3427c127ec..3427c127ec 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
index 78464fe40d..78464fe40d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
index faff36c2a4..faff36c2a4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
index 750006cec6..750006cec6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
index ef9f561d1b..ef9f561d1b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
index 1bc2156183..1bc2156183 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
index a198eaf646..a198eaf646 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
index dc752a2aea..dc752a2aea 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
index aa2f06909b..aa2f06909b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
index c7569720f0..c7569720f0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
index bc76373633..bc76373633 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
index 2f10177bd0..2f10177bd0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
index de8624455f..de8624455f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
index 1813de4e67..1813de4e67 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
index 9b49adbfbb..9b49adbfbb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
index 7889a80bf1..7889a80bf1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
index cdd49904d3..cdd49904d3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
index 6f0ef584da..6f0ef584da 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
index 71003d008f..71003d008f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
index 271f1e669b..271f1e669b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
index f2baffce9a..f2baffce9a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
index 1b44da9752..1b44da9752 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
index 8270ba1a8c..8270ba1a8c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
index 922759cd8d..922759cd8d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
index ac7b0af175..ac7b0af175 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
index 47f0775c16..47f0775c16 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
index 0e894cb7ea..0e894cb7ea 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
index 13bc1d499e..13bc1d499e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
index 8e76958e31..8e76958e31 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
index 1e4264256b..1e4264256b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
index 12b0f404ae..12b0f404ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
index b679214c6c..b679214c6c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
index 415634c80f..415634c80f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
index 937d82b33e..937d82b33e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
index cb868d18a0..cb868d18a0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 3e77527d73..3e77527d73 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/ScenarioFive.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/ScenarioFive.composite
index b3675a0194..b3675a0194 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/ScenarioFive.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/ScenarioFive.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/ScenarioFour.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/ScenarioFour.composite
index 50bfc02803..50bfc02803 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/ScenarioFour.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/ScenarioFour.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/ScenarioOne.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/ScenarioOne.composite
index 495ca2a41f..495ca2a41f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/ScenarioOne.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/ScenarioOne.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/ScenarioSix.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/ScenarioSix.composite
index 840cd076b1..840cd076b1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/ScenarioSix.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/ScenarioSix.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/ScenarioThree.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/ScenarioThree.composite
index f02ba89496..f02ba89496 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/ScenarioThree.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/ScenarioThree.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/ScenarioTwo.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/ScenarioTwo.composite
index ed3f545f72..ed3f545f72 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/ScenarioTwo.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/ScenarioTwo.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/itest_scenario.idl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/itest_scenario.idl
index 41489a4565..41489a4565 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/itest_scenario.idl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/itest_scenario.idl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/scenariofour.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/scenariofour.xsd
index 2669b54be3..2669b54be3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/corba/src/test/resources/scenariofour.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/corba/src/test/resources/scenariofour.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/client/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/client/pom.xml
index 0791af8c0c..0791af8c0c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/client/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/client/src/main/java/itest/client/impl/ClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/client/src/main/java/itest/client/impl/ClientImpl.java
index 5ae417b845..5ae417b845 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/client/src/main/java/itest/client/impl/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/client/src/main/java/itest/client/impl/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/client/src/main/java/itest/privatecopy/intf/ServiceIntf.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/client/src/main/java/itest/privatecopy/intf/ServiceIntf.java
index a554461f26..a554461f26 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/client/src/main/java/itest/privatecopy/intf/ServiceIntf.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/client/src/main/java/itest/privatecopy/intf/ServiceIntf.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/client/src/main/java/itest/privatecopy/types/Name.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/client/src/main/java/itest/privatecopy/types/Name.java
index b8ef3e0305..b8ef3e0305 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/client/src/main/java/itest/privatecopy/types/Name.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/client/src/main/java/itest/privatecopy/types/Name.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/client/src/main/resources/helloworld-client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/client/src/main/resources/helloworld-client.composite
index 461ec33c89..461ec33c89 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/client/src/main/resources/helloworld-client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/client/src/main/resources/helloworld-client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/common/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/common/pom.xml
index 154edd45b8..154edd45b8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/common/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/common/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/common/src/main/java/itest/common/intf/ClientIntf.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/common/src/main/java/itest/common/intf/ClientIntf.java
index 8fbdac95a6..8fbdac95a6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/common/src/main/java/itest/common/intf/ClientIntf.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/common/src/main/java/itest/common/intf/ClientIntf.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/common/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/common/src/main/resources/META-INF/sca-contribution.xml
index 393bd0baaf..393bd0baaf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/common/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/common/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/driver/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/driver/pom.xml
index cc2f77c45e..cc2f77c45e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/driver/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/driver/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/driver/src/test/java/itest/CrossContribTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/driver/src/test/java/itest/CrossContribTestCase.java
index 88b747856d..88b747856d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/driver/src/test/java/itest/CrossContribTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/driver/src/test/java/itest/CrossContribTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/pom.xml
index 61d40925ac..61d40925ac 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/service/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/service/pom.xml
index 86d5630f7e..86d5630f7e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/service/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/service/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/service/src/main/java/itest/privatecopy/intf/ServiceIntf.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/service/src/main/java/itest/privatecopy/intf/ServiceIntf.java
index fd258b3611..fd258b3611 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/service/src/main/java/itest/privatecopy/intf/ServiceIntf.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/service/src/main/java/itest/privatecopy/intf/ServiceIntf.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/service/src/main/java/itest/privatecopy/types/Name.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/service/src/main/java/itest/privatecopy/types/Name.java
index 931a67cc59..931a67cc59 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/service/src/main/java/itest/privatecopy/types/Name.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/service/src/main/java/itest/privatecopy/types/Name.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/service/src/main/java/itest/service/impl/ServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/service/src/main/java/itest/service/impl/ServiceImpl.java
index b8490c073a..b8490c073a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/service/src/main/java/itest/service/impl/ServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/service/src/main/java/itest/service/impl/ServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/service/src/main/resources/helloworld-service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/service/src/main/resources/helloworld-service.composite
index 14a7801cf1..14a7801cf1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/data-copy/service/src/main/resources/helloworld-service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/data-copy/service/src/main/resources/helloworld-service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/pom.xml
index 36eb74c70a..36eb74c70a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
index 5d389643cc..5d389643cc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
index 52f1c01fd8..52f1c01fd8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
index f1c948dc1c..f1c948dc1c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
index 4a4419a42b..4a4419a42b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
index 65f019ec48..65f019ec48 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
index 45c01dc054..45c01dc054 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
index 4e0bd38b2b..4e0bd38b2b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
index 40aff31297..40aff31297 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
index ca012b967d..ca012b967d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
index be446c9759..be446c9759 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
index 3bae554dc7..3bae554dc7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
index a31cc3d45a..a31cc3d45a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
index df9e6e53ec..df9e6e53ec 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
index 779943739e..779943739e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
index 6239c0f5f1..6239c0f5f1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
index 690a2adb3d..690a2adb3d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
index 3bdf886dfa..3bdf886dfa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
index 0fdf69459f..0fdf69459f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
index 3b9690b7d2..3b9690b7d2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
index 351d9df0cb..351d9df0cb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
index 2f3bd3f2cb..2f3bd3f2cb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
index 078be8896e..078be8896e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
index 4d451e6d32..4d451e6d32 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
index d520e64881..d520e64881 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
index 460f6dd1a4..460f6dd1a4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
index 858b8da59a..858b8da59a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
index 6c7c82a4ba..6c7c82a4ba 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
index 44b6e9d906..44b6e9d906 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
index e0b81152ad..e0b81152ad 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
index eea19521c4..eea19521c4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
index 263d1212ca..263d1212ca 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
index 182ccf0f83..182ccf0f83 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
index 3ceee3c4b1..3ceee3c4b1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
index 6aefb05c83..6aefb05c83 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
index 4e40f006d6..4e40f006d6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
index 68510b4b03..68510b4b03 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
index 10a242be4d..10a242be4d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
index 0b5dacda35..0b5dacda35 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
index c38ee6ee78..c38ee6ee78 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
index db01ba12ba..db01ba12ba 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
index 09d42b2bdf..09d42b2bdf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
index 5aefe799a6..5aefe799a6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
index 8bacf13063..8bacf13063 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
index 6aac75ae08..6aac75ae08 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
index 755619908d..755619908d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
index 8ece2c3293..8ece2c3293 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
index dd9a689353..dd9a689353 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/pom.xml
index a0619145e1..a0619145e1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
index ab2d9630eb..ab2d9630eb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
index 7bd95cec95..7bd95cec95 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
index ac6c8d5a60..ac6c8d5a60 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
index 3a5a81bae4..3a5a81bae4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
index 1f3b7ec633..1f3b7ec633 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
index 0c073cd054..0c073cd054 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
index 61449c8981..61449c8981 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
index 690001bfe1..690001bfe1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
index e55d2527f4..e55d2527f4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
index 60ff4163d0..60ff4163d0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
index b3d3c3eb3a..b3d3c3eb3a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
index 1fa525a0ee..1fa525a0ee 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
index 9d851455da..9d851455da 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
index a76e5c5802..a76e5c5802 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
index f62689c8b8..f62689c8b8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
index 432c3115bd..432c3115bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
index 9b08c334cc..9b08c334cc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
index f9ac98d5bc..f9ac98d5bc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
index 219497e2c1..219497e2c1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
index 3351e9c441..3351e9c441 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
index 8430d5e978..8430d5e978 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
index 7499978c0e..7499978c0e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/pom.xml
index 033b39009a..033b39009a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/databindings/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/databindings/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/bin-distro-unzip/build.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/bin-distro-unzip/build.xml
index 6e6a1ea9ef..6e6a1ea9ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/bin-distro-unzip/build.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/bin-distro-unzip/build.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/bin-distro-unzip/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/bin-distro-unzip/pom.xml
index 8d3fb9d2a4..8d3fb9d2a4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/bin-distro-unzip/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/bin-distro-unzip/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-binding-jsonrpc-calculator/build.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-binding-jsonrpc-calculator/build.xml
index 3822085094..3822085094 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-binding-jsonrpc-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-binding-jsonrpc-calculator/build.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-binding-jsonrpc-calculator/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-binding-jsonrpc-calculator/pom.xml
index 4c8f14aafe..4c8f14aafe 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-binding-jsonrpc-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-binding-jsonrpc-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-binding-rmi-calculator/build.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-binding-rmi-calculator/build.xml
index 7550f70fb5..7550f70fb5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-binding-rmi-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-binding-rmi-calculator/build.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-binding-rmi-calculator/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-binding-rmi-calculator/pom.xml
index 9a87ec575e..9a87ec575e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-binding-rmi-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-binding-rmi-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-binding-sca-calculator/build.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-binding-sca-calculator/build.xml
index aa13cba49b..aa13cba49b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-binding-sca-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-binding-sca-calculator/build.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-binding-sca-calculator/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-binding-sca-calculator/pom.xml
index c859139391..c859139391 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-binding-sca-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-binding-sca-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-binding-ws-calculator/build.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-binding-ws-calculator/build.xml
index 7b95bedf6c..7b95bedf6c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-binding-ws-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-binding-ws-calculator/build.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-binding-ws-calculator/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-binding-ws-calculator/pom.xml
index 64a23cf6ae..64a23cf6ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-binding-ws-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-binding-ws-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-implementation-java-calculator/build.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-implementation-java-calculator/build.xml
index e70619ab51..e70619ab51 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-implementation-java-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-implementation-java-calculator/build.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-implementation-java-calculator/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-implementation-java-calculator/pom.xml
index 70f2f0381d..70f2f0381d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/contribution-implementation-java-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/contribution-implementation-java-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/launcher-embedded-jse/build.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/launcher-embedded-jse/build.xml
index 02c353e083..02c353e083 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/launcher-embedded-jse/build.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/launcher-embedded-jse/build.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/launcher-embedded-jse/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/launcher-embedded-jse/pom.xml
index 42ec48095b..42ec48095b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/launcher-embedded-jse/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/launcher-embedded-jse/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/launcher-embedded-osgi/build.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/launcher-embedded-osgi/build.xml
index 0015b13f49..0015b13f49 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/launcher-embedded-osgi/build.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/launcher-embedded-osgi/build.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/launcher-embedded-osgi/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/launcher-embedded-osgi/pom.xml
index 68b48a3ba4..68b48a3ba4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/launcher-embedded-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/launcher-embedded-osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/legal-checks/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/legal-checks/pom.xml
index 0d6d57949a..0d6d57949a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/legal-checks/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/legal-checks/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
index 865eec3636..865eec3636 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/pom.xml
index 80a5fafb4d..80a5fafb4d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/src-distro-rat/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/src-distro-rat/pom.xml
index 57217a25a9..57217a25a9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/src-distro-rat/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/src-distro-rat/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/src-distro-unzip/build.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/src-distro-unzip/build.xml
index db9fe4a969..db9fe4a969 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/src-distro-unzip/build.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/src-distro-unzip/build.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/src-distro-unzip/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/src-distro-unzip/pom.xml
index 8bb86c71e4..8bb86c71e4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/distribution/src-distro-unzip/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/distribution/src-distro-unzip/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/distributed/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/distributed/pom.xml
index 8000d91162..8000d91162 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/distributed/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/distributed/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/distributed/src/test/java/itest/Helloworld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/distributed/src/test/java/itest/Helloworld.java
index f764bc8358..f764bc8358 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/distributed/src/test/java/itest/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/distributed/src/test/java/itest/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/distributed/src/test/java/itest/StandaloneTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/distributed/src/test/java/itest/StandaloneTestCase.java
index 222b3e8c3a..222b3e8c3a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/distributed/src/test/java/itest/StandaloneTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/distributed/src/test/java/itest/StandaloneTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/endpoint-uri/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/endpoint-uri/pom.xml
index 4b8d30b992..4b8d30b992 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/endpoint-uri/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/endpoint-uri/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/endpoint-uri/src/test/java/itest/EndpointURITestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/endpoint-uri/src/test/java/itest/EndpointURITestCase.java
index 360b3bd57e..360b3bd57e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/endpoint-uri/src/test/java/itest/EndpointURITestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/endpoint-uri/src/test/java/itest/EndpointURITestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/endpoint-uri/src/test/resources/helloworld-ws.jar b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/endpoint-uri/src/test/resources/helloworld-ws.jar
index 39098190ba..39098190ba 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/endpoint-uri/src/test/resources/helloworld-ws.jar
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/endpoint-uri/src/test/resources/helloworld-ws.jar
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/helloworld/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/helloworld/pom.xml
index ae6c758e7f..ae6c758e7f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/helloworld/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/helloworld/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java
index 2a10b3fb77..2a10b3fb77 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml
index 8939a73d01..8939a73d01 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/helloworld/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/helloworld/src/main/resources/helloworld.composite
index 18d064c588..18d064c588 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/helloworld/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/helloworld/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/interfaces/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/interfaces/pom.xml
index dc9a792566..dc9a792566 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/interfaces/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/interfaces/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/interfaces/src/main/java/itest/Helloworld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/interfaces/src/main/java/itest/Helloworld.java
index f764bc8358..f764bc8358 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/interfaces/src/main/java/itest/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/interfaces/src/main/java/itest/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/pom.xml
index bbe764824c..bbe764824c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/standalone/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/standalone/pom.xml
index 3f4e346059..3f4e346059 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/standalone/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/standalone/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java
index 0fbcc98a96..0fbcc98a96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/endpoints/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/endpoints/pom.xml
index a3cf75f027..a3cf75f027 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/endpoints/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/endpoints/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java
index c307547f56..c307547f56 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/endpoints/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/endpoints/src/test/java/helloworld/HelloWorldService.java
index 064d615c45..064d615c45 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/endpoints/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/endpoints/src/test/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/endpoints/src/test/java/test/EndpointsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/endpoints/src/test/java/test/EndpointsTestCase.java
index 7802848c3b..7802848c3b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/endpoints/src/test/java/test/EndpointsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/endpoints/src/test/java/test/EndpointsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java
index f3b6c15bf1..f3b6c15bf1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/endpoints/src/test/java/test/Utils.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/endpoints/src/test/java/test/Utils.java
index 5107d8f660..5107d8f660 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/endpoints/src/test/java/test/Utils.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/endpoints/src/test/java/test/Utils.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/endpoints/src/test/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/endpoints/src/test/resources/helloworld.composite
index 1f56c3d73b..1f56c3d73b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/endpoints/src/test/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/endpoints/src/test/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/endpoints/src/test/resources/nested.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/endpoints/src/test/resources/nested.composite
index 138020eab0..138020eab0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/endpoints/src/test/resources/nested.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/endpoints/src/test/resources/nested.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/pom.xml
index 9cf7e40083..9cf7e40083 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
index 1f57116bac..1f57116bac 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
index 112aefc747..112aefc747 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
index 53a6c70b57..53a6c70b57 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
index ace219991b..ace219991b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
index 453528444d..453528444d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
index 26b9f0a383..26b9f0a383 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
index cd62338841..cd62338841 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
index 56b9fc6f5b..56b9fc6f5b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
index a8a065f0e2..a8a065f0e2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/resources/ExceptionTest.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/resources/ExceptionTest.composite
index b8a8b01e8b..b8a8b01e8b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/main/resources/ExceptionTest.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/main/resources/ExceptionTest.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
index 7794348476..7794348476 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/pom.xml
index d998860400..d998860400 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index bd7770ca7d..bd7770ca7d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index 747433a9e7..747433a9e7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/AddService.java
index dd7ecb827d..dd7ecb827d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
index eae607a7ca..eae607a7ca 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
index ce1cdaae5a..ce1cdaae5a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
index b033516c1b..b033516c1b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
index 4f063993a3..4f063993a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
index b3ef6e7312..b3ef6e7312 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
index 595626e672..595626e672 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
index 968d420fc8..968d420fc8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
index 8bb3006d12..8bb3006d12 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
index f68134702b..f68134702b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
index 78b3649b5b..78b3649b5b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/mock/TestBean.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/mock/TestBean.java
index 1a0abd7f8f..1a0abd7f8f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/mock/TestBean.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/mock/TestBean.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
index e3d9a36bb8..e3d9a36bb8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
index 47342fded8..47342fded8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/mock/TestReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/mock/TestReference.java
index 6f5b280f31..6f5b280f31 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/mock/TestReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/mock/TestReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
index dea7933e1a..dea7933e1a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
index b80b05dc08..b80b05dc08 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
index 544b39ad58..544b39ad58 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml
index 81d59432b8..81d59432b8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
index f5514bad0a..f5514bad0a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
index 27df510da8..27df510da8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
index c50f0ef4d9..c50f0ef4d9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
index a0bb10e8dd..a0bb10e8dd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
index 5973484f6e..5973484f6e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF
index 9267f28e83..9267f28e83 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml
index 62e4e077b6..62e4e077b6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml
index 5b1885d6b3..5b1885d6b3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml
index dcc88f6770..dcc88f6770 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
index 0e7cb86633..0e7cb86633 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
index 0238f0b013..0238f0b013 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
index 5ffeda11df..5ffeda11df 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml
index efc2464425..efc2464425 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
index c50f0ef4d9..c50f0ef4d9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
index e889d84544..e889d84544 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
index 950dbeba4c..950dbeba4c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
index 8613e6c82a..8613e6c82a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
index b7281272da..b7281272da 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar
index 504d59e5ff..504d59e5ff 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
index 9912624870..9912624870 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
index 62e4e077b6..62e4e077b6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
index e9f8bb888b..e9f8bb888b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
index 30719684a9..30719684a9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
index 1705164104..1705164104 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
index 539dfa6e32..539dfa6e32 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
index fcbafad27d..fcbafad27d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
index 4204b75b48..4204b75b48 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
index 5fe57ed733..5fe57ed733 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
index 83558e8abc..83558e8abc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
index c9bb5b9e3e..c9bb5b9e3e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
index 856b41f897..856b41f897 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
index b59114bd31..b59114bd31 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml
index 4a873f2424..4a873f2424 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
index a346e290b9..a346e290b9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
index 2602839d1d..2602839d1d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
index c029b06a8c..c029b06a8c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
index 8df60c5bab..8df60c5bab 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
index f5261c85bb..f5261c85bb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
index 83875e0b0a..83875e0b0a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
index 19892597c1..19892597c1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
index a44ae38d24..a44ae38d24 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
index d54f0544d8..d54f0544d8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
index 71768f5a7b..71768f5a7b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
index 0c6f8d2e84..0c6f8d2e84 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
index 53cc094aca..53cc094aca 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
index 5869d344f6..5869d344f6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
index 90d26dd89f..90d26dd89f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
index f28dace31a..f28dace31a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
index def30b3ea0..def30b3ea0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
index fa7967c964..fa7967c964 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
index b57cc7f366..b57cc7f366 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
index 0c2e1daa81..0c2e1daa81 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
index 8d0c548899..8d0c548899 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
index f4bd53876c..f4bd53876c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
index 0907985d7f..0907985d7f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
index c2dfbf247f..c2dfbf247f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
index 5db9c84c00..5db9c84c00 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/exports/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/exports/pom.xml
index b86b255cdd..b86b255cdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/exports/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/exports/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/exports/src/main/java/org/apache/tuscany/sca/itest/exports/Helloworld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/exports/src/main/java/org/apache/tuscany/sca/itest/exports/Helloworld.java
index 186e42da39..186e42da39 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/exports/src/main/java/org/apache/tuscany/sca/itest/exports/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/exports/src/main/java/org/apache/tuscany/sca/itest/exports/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/exports/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/exports/src/main/resources/META-INF/sca-contribution.xml
index 9a0edcba68..9a0edcba68 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/exports/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/exports/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/imports/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/imports/pom.xml
index 4ddd4122dd..4ddd4122dd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/imports/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/imports/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/imports/src/main/java/org/apache/tuscany/sca/itest/imports/HelloworldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/imports/src/main/java/org/apache/tuscany/sca/itest/imports/HelloworldImpl.java
index 4c7bc92b4f..4c7bc92b4f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/imports/src/main/java/org/apache/tuscany/sca/itest/imports/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/imports/src/main/java/org/apache/tuscany/sca/itest/imports/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/imports/src/main/resources/Helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/imports/src/main/resources/Helloworld.composite
index b4e2ff8868..b4e2ff8868 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/imports/src/main/resources/Helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/imports/src/main/resources/Helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/imports/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/imports/src/main/resources/META-INF/sca-contribution.xml
index c136923ab4..c136923ab4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/imports/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/imports/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/pom.xml
index 6ccbc7d4b8..6ccbc7d4b8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/tests/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/tests/pom.xml
index d75d586acd..d75d586acd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/tests/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/tests/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/tests/src/test/java/org/apache/tuscany/sca/itests/TestTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/tests/src/test/java/org/apache/tuscany/sca/itests/TestTestCase.java
index ea76a23c03..ea76a23c03 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/import-export/tests/src/test/java/org/apache/tuscany/sca/itests/TestTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/import-export/tests/src/test/java/org/apache/tuscany/sca/itests/TestTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/pom.xml
index 5650ed2741..5650ed2741 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
index f4131593d5..f4131593d5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
index 3c7a398abd..3c7a398abd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
index fc88c4f119..fc88c4f119 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
index 05a9d09bdd..05a9d09bdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
index ab0b18191c..ab0b18191c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
index 724d94dffb..724d94dffb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
index be3fa4c15a..be3fa4c15a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
index 9f34dfd274..9f34dfd274 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
index efeb6f91fe..efeb6f91fe 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
index b29b298ab6..b29b298ab6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
index 00a0f5645b..00a0f5645b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/invalid/InvalidRemoteAttribute.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/invalid/InvalidRemoteAttribute.composite
index da5700aa35..da5700aa35 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/invalid/InvalidRemoteAttribute.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/invalid/InvalidRemoteAttribute.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/valid/InterfacesTest.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/valid/InterfacesTest.composite
index e9267b75d3..e9267b75d3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/valid/InterfacesTest.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/valid/InterfacesTest.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
index 1bc047092a..1bc047092a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java
index 5aa8be2f04..5aa8be2f04 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/pom.xml
index 5c65b76a19..5c65b76a19 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/src/main/java/itest/ConstructorException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/src/main/java/itest/ConstructorException.java
index bae0bdcd0f..bae0bdcd0f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/src/main/java/itest/ConstructorException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/src/main/java/itest/ConstructorException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/src/main/java/itest/DestroyCompositeScopeException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/src/main/java/itest/DestroyCompositeScopeException.java
index b5d463a1aa..b5d463a1aa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/src/main/java/itest/DestroyCompositeScopeException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/src/main/java/itest/DestroyCompositeScopeException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/src/main/java/itest/InitCompositeScopeException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/src/main/java/itest/InitCompositeScopeException.java
index 58aeb96c3c..58aeb96c3c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/src/main/java/itest/InitCompositeScopeException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/src/main/java/itest/InitCompositeScopeException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/src/main/java/itest/InitStatelessScopeException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/src/main/java/itest/InitStatelessScopeException.java
index a976f805a0..a976f805a0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/src/main/java/itest/InitStatelessScopeException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/src/main/java/itest/InitStatelessScopeException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/src/main/java/itest/OkImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/src/main/java/itest/OkImpl.java
index 823b771923..823b771923 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/src/main/java/itest/OkImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/src/main/java/itest/OkImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/src/main/java/itest/Service.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/src/main/java/itest/Service.java
index f6f292c4c8..f6f292c4c8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/src/main/java/itest/Service.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/src/main/java/itest/Service.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/src/main/resources/test.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/src/main/resources/test.composite
index fa93989fa0..fa93989fa0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/src/main/resources/test.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/src/main/resources/test.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/src/test/java/itest/InitTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/src/test/java/itest/InitTestCase.java
index afb6b5fad8..afb6b5fad8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/java-lifecycle-exceptions/src/test/java/itest/InitTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/java-lifecycle-exceptions/src/test/java/itest/InitTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws-asyncclient/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws-asyncclient/pom.xml
index e7f7c3589a..e7f7c3589a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws-asyncclient/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws-asyncclient/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java
index 4e55bae98d..4e55bae98d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java
index 0bf3328c31..0bf3328c31 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java
index a43b85361b..a43b85361b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java
index b15ab6be08..b15ab6be08 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml
index b30367319d..b30367319d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite
index 548b7a9da5..548b7a9da5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java
index eb72924093..eb72924093 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws/pom.xml
index 7ed917cf61..7ed917cf61 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java
index e1c2bedea3..e1c2bedea3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws/src/test/java/stock/StockQuote.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws/src/test/java/stock/StockQuote.java
index 74e25bb3bd..74e25bb3bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws/src/test/java/stock/StockQuote.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws/src/test/java/stock/StockQuote.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws/src/test/java/stock/StockQuoteImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws/src/test/java/stock/StockQuoteImpl.java
index 516c63d864..516c63d864 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws/src/test/java/stock/StockQuoteImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws/src/test/java/stock/StockQuoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws/src/test/resources/StockQuote.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws/src/test/resources/StockQuote.composite
index c8c7719dfa..c8c7719dfa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jaxws/src/test/resources/StockQuote.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jaxws/src/test/resources/StockQuote.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/pom.xml
index 833bfc4c28..833bfc4c28 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml
index ce6a9514af..ce6a9514af 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite
index 7f9ed9612f..7f9ed9612f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite
index 33364f61c0..33364f61c0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
index 3bf4e0bc30..3bf4e0bc30 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/pom.xml
index d15d120494..d15d120494 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 68506b857b..68506b857b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
index 5f19aa1fa5..5f19aa1fa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
index 18324d5d1d..18324d5d1d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml
index ac6e94ca21..ac6e94ca21 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/resources/jndi.properties
index 7f82eb48d3..7f82eb48d3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/resources/selectors/selectors.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/resources/selectors/selectors.composite
index fcda648f1c..fcda648f1c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/main/resources/selectors/selectors.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
index 28e0b530c1..28e0b530c1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/pom.xml
index 6f63cb99d4..6f63cb99d4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
index f90db55dda..f90db55dda 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
index b78feab413..b78feab413 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
index 20b74ccc1a..20b74ccc1a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
index cec4e6fa6d..cec4e6fa6d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml
index 68c3bfa4e0..68c3bfa4e0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/resources/jndi.properties
index b8c4b1c6aa..b8c4b1c6aa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/resources/simple/client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/resources/simple/client.composite
index 64d45f1816..64d45f1816 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/resources/simple/client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/resources/simple/client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/resources/simple/tempq.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/resources/simple/tempq.composite
index f9bccedfe9..f9bccedfe9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/main/resources/simple/tempq.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/main/resources/simple/tempq.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
index 1661a4614c..1661a4614c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
index 5897df6784..5897df6784 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/pom.xml
index b674531e96..b674531e96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml
index f4da034c55..f4da034c55 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/resources/defaults/client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/resources/defaults/client.composite
index ebafbb6bcd..ebafbb6bcd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/resources/defaults/client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/resources/defaults/client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/resources/defaults/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/resources/defaults/service.composite
index 5354afb130..5354afb130 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/resources/defaults/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/resources/defaults/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/resources/jndi.properties
index c8b186a83c..c8b186a83c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
index d2b1a5fe59..d2b1a5fe59 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/pom.xml
index f91c1f2812..f91c1f2812 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 6b763874df..6b763874df 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml
index a57e5befe2..a57e5befe2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/resources/definitions.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/resources/definitions.xml
index 07b9f4aaa8..07b9f4aaa8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/resources/definitions.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/resources/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/resources/definitions/definitions.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/resources/definitions/definitions.composite
index 6e478e067d..6e478e067d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/resources/definitions/definitions.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/resources/definitions/definitions.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/resources/jndi.properties
index d7f64fda62..d7f64fda62 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
index 729ad072b7..729ad072b7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/pom.xml
index 35994a318b..35994a318b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
index 469882f3b3..469882f3b3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
index 19b584950a..19b584950a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
index b12e3a562e..b12e3a562e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
index b23db73c01..b23db73c01 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
index 9e4c4c46d4..9e4c4c46d4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
index 866acf1ce1..866acf1ce1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml
index 865bb39b4c..865bb39b4c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/resources/exceptions/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/resources/exceptions/service.composite
index 42e33330d7..42e33330d7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/resources/exceptions/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/resources/exceptions/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/resources/jndi.properties
index 72d5457faf..72d5457faf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index b266517282..b266517282 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/pom.xml
index 107b962e51..107b962e51 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
index 469882f3b3..469882f3b3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
index 19b584950a..19b584950a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
index b12e3a562e..b12e3a562e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
index b23db73c01..b23db73c01 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
index 9e4c4c46d4..9e4c4c46d4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
index 02426936d2..02426936d2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
index 866acf1ce1..866acf1ce1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml
index 53504398bf..53504398bf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/resources/exceptions/client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
index 86451dcf02..86451dcf02 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/resources/exceptions/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/resources/exceptions/service.composite
index dce41b86ac..dce41b86ac 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/resources/exceptions/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/resources/exceptions/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/resources/jndi.properties
index f7875b52a2..f7875b52a2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index 9d3a55754c..9d3a55754c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/pom.xml
index 702f736d2f..702f736d2f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml
index 5883e9a2d8..5883e9a2d8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/resources/external/client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/resources/external/client.composite
index e27e3818f8..e27e3818f8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/resources/external/client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/resources/external/client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/resources/external/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/resources/external/service.composite
index d5ab03e688..d5ab03e688 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/resources/external/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/resources/external/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
index 53acb22e64..53acb22e64 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/pom.xml
index 744b6000bb..744b6000bb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
index cdd079810e..cdd079810e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
index 49cb0a69ab..49cb0a69ab 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/pom.xml
index 262fe94298..262fe94298 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
index 1684c19c50..1684c19c50 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
index cc7b7b11e4..cc7b7b11e4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
index 3742bd6ac6..3742bd6ac6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
index eae95b4201..eae95b4201 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
index a37a03d994..a37a03d994 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
index f74ab86a14..f74ab86a14 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
index 53498ce44d..53498ce44d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/pom.xml
index 96de5b66f8..96de5b66f8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
index 530eac3d00..530eac3d00 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
index 1768816247..1768816247 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
index d0a5faaef7..d0a5faaef7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
index 204863423d..204863423d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
index b143079fe3..b143079fe3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
index b62d1b1f1d..b62d1b1f1d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
index 56285ad234..56285ad234 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl
index 935a2e73c5..935a2e73c5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
index 78c0239f0d..78c0239f0d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/pom.xml
index b6c7182ba9..b6c7182ba9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
index 490bd5d4a3..490bd5d4a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
index 5aed6b12d7..5aed6b12d7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
index efe2f1a4dc..efe2f1a4dc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
index c1011ce6fb..c1011ce6fb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
index d863b3a0a3..d863b3a0a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
index 0f7a730b91..0f7a730b91 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
index 48608ba9b3..48608ba9b3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl
index f72ce434fa..f72ce434fa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
index f47031da10..f47031da10 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/pom.xml
index 5d5fe82e51..5d5fe82e51 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
index a1c38f7295..a1c38f7295 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
index 3b34dbae85..3b34dbae85 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
index 04d4a02462..04d4a02462 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
index b179a86f52..b179a86f52 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
index fa9e9eb1cb..fa9e9eb1cb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
index 29233d74a9..29233d74a9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
index 7950309b07..7950309b07 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
index a2bfc0ca8a..a2bfc0ca8a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/pom.xml
index 964a273781..964a273781 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
index 57ad23e064..57ad23e064 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
index ea8d5ffd28..ea8d5ffd28 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
index afcd391009..afcd391009 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
index 8af585c13c..8af585c13c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
index 4f0a6fe4c5..4f0a6fe4c5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
index a8dd686725..a8dd686725 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
index a9e8782f94..a9e8782f94 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
index b887aa18fd..b887aa18fd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/pom.xml
index fa8bb80ce6..fa8bb80ce6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
index 5e9a7a316e..5e9a7a316e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
index 768b293380..768b293380 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
index 2bac5db5ab..2bac5db5ab 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
index fe200e3cbe..fe200e3cbe 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
index 80624ee770..80624ee770 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
index 175b482c81..175b482c81 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
index c15d99550e..c15d99550e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl
index ac68c85fd5..ac68c85fd5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
index 6054050a5d..6054050a5d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
index c0e64026a0..c0e64026a0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
index 1684c19c50..1684c19c50 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
index cc7b7b11e4..cc7b7b11e4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
index 3742bd6ac6..3742bd6ac6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
index eae95b4201..eae95b4201 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
index a37a03d994..a37a03d994 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
index 530eac3d00..530eac3d00 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
index 1768816247..1768816247 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
index d0a5faaef7..d0a5faaef7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
index 204863423d..204863423d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
index b143079fe3..b143079fe3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
index b62d1b1f1d..b62d1b1f1d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
index 490bd5d4a3..490bd5d4a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
index 5aed6b12d7..5aed6b12d7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
index efe2f1a4dc..efe2f1a4dc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
index c1011ce6fb..c1011ce6fb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
index d863b3a0a3..d863b3a0a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
index 0f7a730b91..0f7a730b91 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
index a1c38f7295..a1c38f7295 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
index 3b34dbae85..3b34dbae85 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
index 443d2aa746..443d2aa746 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
index b179a86f52..b179a86f52 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
index fa9e9eb1cb..fa9e9eb1cb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
index 29233d74a9..29233d74a9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
index 57ad23e064..57ad23e064 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
index ea8d5ffd28..ea8d5ffd28 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
index afcd391009..afcd391009 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
index 8af585c13c..8af585c13c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
index 4f0a6fe4c5..4f0a6fe4c5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
index a8dd686725..a8dd686725 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
index 5e9a7a316e..5e9a7a316e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
index 768b293380..768b293380 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
index 2bac5db5ab..2bac5db5ab 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
index be2af78958..be2af78958 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
index e85d4ca5a4..e85d4ca5a4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
index 175b482c81..175b482c81 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
index 7bb33ae270..7bb33ae270 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
index 9f955c278a..9f955c278a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
index 7c1cce6087..7c1cce6087 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
index 3d41f656f9..3d41f656f9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
index 79dd18b027..79dd18b027 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
index 935a2e73c5..935a2e73c5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
index 27077cb3c9..27077cb3c9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/pom.xml
index f01f7721d9..f01f7721d9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
index 9083ba1d9c..9083ba1d9c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
index 3149f99a25..3149f99a25 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml
index decff8708f..decff8708f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/resources/jndi.properties
index 03690b1169..03690b1169 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
index 67d5038a51..67d5038a51 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
index 54cfdeb273..54cfdeb273 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/pom.xml
index 38648dcfda..38648dcfda 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml
index 16825fe48f..16825fe48f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/resources/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/resources/service.composite
index a712990a9b..a712990a9b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/main/resources/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/main/resources/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
index 848e340181..848e340181 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/pom.xml
index b2f050b852..b2f050b852 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 7fed36fa77..7fed36fa77 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
index 7ab6019fd5..7ab6019fd5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
index 89758becff..89758becff 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml
index ccb52c8702..ccb52c8702 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/resources/jndi.properties
index 4bada514fa..4bada514fa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/resources/nulls.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/resources/nulls.composite
index 1aa17808bf..1aa17808bf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/main/resources/nulls.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/main/resources/nulls.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
index ac872f46a6..ac872f46a6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/pom.xml
index 5c0a04c359..5c0a04c359 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml
index edd6d508f7..edd6d508f7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/resources/jndi.properties
index 8934614a8a..8934614a8a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
index bf709776df..bf709776df 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
index da2e6a2264..da2e6a2264 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
index 5d1f764382..5d1f764382 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/pom.xml
index a76fff963b..a76fff963b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
index 9083ba1d9c..9083ba1d9c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
index 3149f99a25..3149f99a25 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml
index edd6d508f7..edd6d508f7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite
index 8bccf22bea..8bccf22bea 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite
index 0014b88050..0014b88050 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
index 14bbf238e1..14bbf238e1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/pom.xml
index a9955901c9..a9955901c9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
index 464072b42d..464072b42d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
index 4140fa0b89..4140fa0b89 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
index 2be4f2ad3e..2be4f2ad3e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
index d5684ca56c..d5684ca56c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
index e18de0456c..e18de0456c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml
index 7e417723f2..7e417723f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml
index 12c7313bb4..12c7313bb4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/resources/jndi.properties
index f0b9fbd734..f0b9fbd734 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
index 68f93669ec..68f93669ec 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
index ebffbc4bc4..ebffbc4bc4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/pom.xml
index cf09350d9b..cf09350d9b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/pom.xml
index 5a3af4944c..5a3af4944c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
index 464072b42d..464072b42d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
index 4140fa0b89..4140fa0b89 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
index 2be4f2ad3e..2be4f2ad3e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
index d5684ca56c..d5684ca56c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
index e18de0456c..e18de0456c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml
index 12c7313bb4..12c7313bb4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/resources/jndi.properties
index c44da27df1..c44da27df1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/resources/properties/properties.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/resources/properties/properties.composite
index 85babc8634..85babc8634 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/main/resources/properties/properties.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/main/resources/properties/properties.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
index e8d748bb19..e8d748bb19 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/pom.xml
index 2447325fe9..2447325fe9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml
index 23c5979291..23c5979291 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/resources/cf/client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/resources/cf/client.composite
index a3e5403432..a3e5403432 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/resources/cf/client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/resources/cf/client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/resources/cf/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/resources/cf/service.composite
index cd04ae7836..cd04ae7836 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/resources/cf/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/resources/cf/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/resources/jndi.properties
index a41e42950e..a41e42950e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
index 03b834ce7d..03b834ce7d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/pom.xml
index f0d6bc469a..f0d6bc469a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml
index 23c5979291..23c5979291 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/resources/simple/client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/resources/simple/client.composite
index a758389e89..a758389e89 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/resources/simple/client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/resources/simple/client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/resources/simple/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/resources/simple/service.composite
index 33364f61c0..33364f61c0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/main/resources/simple/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
index 3c0eb0791b..3c0eb0791b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/pom.xml
index a55f7523d0..a55f7523d0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index b589d5e8bc..b589d5e8bc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
index 1aff0d454e..1aff0d454e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
index fb53c877e6..fb53c877e6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
index 1bbaf5d6f4..1bbaf5d6f4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
index 4bdc4edcb5..4bdc4edcb5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
index 0592194b21..0592194b21 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
index 2d4ff0192b..2d4ff0192b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
index b632b3f60f..b632b3f60f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
index b2df9137c8..b2df9137c8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
index 0b24678543..0b24678543 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
index 0ce66005fc..0ce66005fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
index 7e42113da4..7e42113da4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
index 724de6ff7c..724de6ff7c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml
index 3527e98032..3527e98032 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
index d8c9d051ba..d8c9d051ba 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
index a3f1d0825b..a3f1d0825b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/jndi.properties
index 7ce468aa0f..7ce468aa0f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/selectors/selectors.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/selectors/selectors.composite
index 1a408dfb9a..1a408dfb9a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/main/resources/selectors/selectors.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
index bee0c549bd..bee0c549bd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
index 33e047ae18..33e047ae18 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
index e7254005be..e7254005be 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/pom.xml
index b739a30d4f..b739a30d4f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml
index c1156b35e6..c1156b35e6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/resources/jndi.properties
index d7988ee60d..d7988ee60d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/resources/topics/TopicsClient.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
index d4027ff60d..d4027ff60d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/resources/topics/TopicsService.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/resources/topics/TopicsService.composite
index 8726543253..8726543253 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/main/resources/topics/TopicsService.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/main/resources/topics/TopicsService.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
index 35fe96b81a..35fe96b81a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/pom.xml
index d88996a38a..d88996a38a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java
index 336fecf67b..336fecf67b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
index dc6577b7e1..dc6577b7e1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 4f9908f062..4f9908f062 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml
index ff50ad2daa..ff50ad2daa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/resources/jndi.properties
index 7ac9aa559c..7ac9aa559c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/resources/ttl.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/resources/ttl.composite
index 8b06a9fc7c..8b06a9fc7c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/main/resources/ttl.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/main/resources/ttl.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
index b5839f4c4f..b5839f4c4f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/pom.xml
index e5285cf88d..e5285cf88d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml
index 655372580c..655372580c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/resources/jndi.properties
index f6dfc8e9d0..f6dfc8e9d0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/resources/simple/service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/resources/simple/service.composite
index 99ed243196..99ed243196 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/resources/simple/service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
index 8295fb10c9..8295fb10c9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
index 60b0f0a1a3..60b0f0a1a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/pom.xml
index 2e99555ecf..2e99555ecf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleBinding.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleBinding.java
index ecd4393e4d..ecd4393e4d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleBindingFactory.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleBindingFactory.java
index 4fdf09bdf0..4fdf09bdf0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleBindingProviderFactory.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleBindingProviderFactory.java
index f197578e84..f197578e84 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleBindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleReferenceBindingProvider.java
index 5c2ca0bf77..5c2ca0bf77 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleReferenceInvoker.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleReferenceInvoker.java
index 023be8613b..023be8613b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleReferenceInvoker.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleReferenceInvoker.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleServiceBindingProvider.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleServiceBindingProvider.java
index 158aa27201..158aa27201 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleServiceInvoker.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleServiceInvoker.java
index 09ca7a051e..09ca7a051e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleServiceInvoker.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/binding/lifecycle/LifecycleServiceInvoker.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/helloworld/Helloworld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/helloworld/Helloworld.java
index 7b9c17cf59..7b9c17cf59 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/helloworld/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/helloworld/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/helloworld/HelloworldClientImplC.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/helloworld/HelloworldClientImplC.java
index 931e61677d..931e61677d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/helloworld/HelloworldClientImplC.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/helloworld/HelloworldClientImplC.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/helloworld/HelloworldClientImplCE.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/helloworld/HelloworldClientImplCE.java
index af97452ee9..af97452ee9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/helloworld/HelloworldClientImplCE.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/helloworld/HelloworldClientImplCE.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/helloworld/HelloworldClientImplS.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/helloworld/HelloworldClientImplS.java
index 493ccca972..493ccca972 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/helloworld/HelloworldClientImplS.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/helloworld/HelloworldClientImplS.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/helloworld/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/helloworld/HelloworldServiceImpl.java
index 2d27ec8f58..2d27ec8f58 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/helloworld/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/helloworld/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/helloworld/StatusImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/helloworld/StatusImpl.java
index 644853d6c2..644853d6c2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/helloworld/StatusImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/helloworld/StatusImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleImplementation.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleImplementation.java
index ebed204b87..ebed204b87 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleImplementation.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleImplementation.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleImplementationProcessor.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleImplementationProcessor.java
index c7989b291c..c7989b291c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleImplementationProcessor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleImplementationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleJavaInvoker.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleJavaInvoker.java
index ac750fe040..ac750fe040 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleJavaInvoker.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleJavaInvoker.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleProvider.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleProvider.java
index f1e303882f..f1e303882f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleProvider.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleProvider.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleProviderFactory.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleProviderFactory.java
index dfd39716fd..dfd39716fd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/java/implementation/lifecycle/LifecycleProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/resources/META-INF/services/binding.lifecycle.BindingFactory b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/resources/META-INF/services/binding.lifecycle.BindingFactory
index 357cf65727..357cf65727 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/resources/META-INF/services/binding.lifecycle.BindingFactory
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/resources/META-INF/services/binding.lifecycle.BindingFactory
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 09a474a567..09a474a567 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index e436702181..e436702181 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 9a814793b2..9a814793b2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index c9b5077888..c9b5077888 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/resources/binding-lifecycle.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/resources/binding-lifecycle.xsd
index b798446c26..b798446c26 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/resources/binding-lifecycle.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/resources/binding-lifecycle.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/resources/implementation-lifecycle.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/resources/implementation-lifecycle.xsd
index c029a43922..c029a43922 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/resources/implementation-lifecycle.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/resources/implementation-lifecycle.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/resources/lifecycle.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/resources/lifecycle.composite
index f08f6fe57b..f08f6fe57b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/main/resources/lifecycle.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/main/resources/lifecycle.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/test/java/org/apache/tuscany/sca/itest/lifecycle/LifecycleTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/test/java/org/apache/tuscany/sca/itest/lifecycle/LifecycleTestCase.java
index b1b0c84376..b1b0c84376 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/lifecycle/src/test/java/org/apache/tuscany/sca/itest/lifecycle/LifecycleTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/lifecycle/src/test/java/org/apache/tuscany/sca/itest/lifecycle/LifecycleTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/node-launcher-equinox/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/node-launcher-equinox/pom.xml
index 0ce874acbf..0ce874acbf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/node-launcher-equinox/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/node-launcher-equinox/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/node-launcher-equinox/src/test/java/hello/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/node-launcher-equinox/src/test/java/hello/HelloWorld.java
index e3fcdfd25f..e3fcdfd25f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/node-launcher-equinox/src/test/java/hello/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/node-launcher-equinox/src/test/java/hello/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
index 8232acb658..8232acb658 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
index e51d3c79d9..e51d3c79d9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
index 5728ad2e07..5728ad2e07 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
index 5cc40ca77f..5cc40ca77f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/node-launcher-equinox/src/test/resources/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/node-launcher-equinox/src/test/resources/HelloWorld.composite
index 32ec5f0e2f..32ec5f0e2f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/node-launcher-equinox/src/test/resources/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/node-launcher-equinox/src/test/resources/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/pom.xml
index 7083cc1678..7083cc1678 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/pom.xml
index d3b3c470ad..d3b3c470ad 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/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-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-client/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-client/pom.xml
index 6e9f279bda..6e9f279bda 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
index 2619dc269b..2619dc269b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
index 3c4ed03448..3c4ed03448 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-iface/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-iface/pom.xml
index 7c9e28c5ed..7c9e28c5ed 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-iface/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-iface/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
index a0710281c9..a0710281c9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-iface/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-iface/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-iface/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-a/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-a/pom.xml
index ea852924c5..ea852924c5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-a/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-a/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-a/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-service-a/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-a/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-a/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-service-a/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-a/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-a/src/main/resources/service-a.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-a/src/main/resources/service-a.composite
index 55122d2d6c..55122d2d6c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-a/src/main/resources/service-a.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-a/src/main/resources/service-a.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-and-client/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-and-client/pom.xml
index 11f6950d2d..11f6950d2d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-and-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-and-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/Helloworld.java b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-service-and-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-service-and-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-service-and-client/src/main/resources/helloworld-service.composite b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-service-and-client/src/main/resources/helloworld-service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-and-client/src/main/resources/helloworld-service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-b/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-b/pom.xml
index 5f699eb688..5f699eb688 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-b/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-b/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-b/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-service-b/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-b/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-b/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-service-b/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-b/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-b/src/main/resources/service-b.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-b/src/main/resources/service-b.composite
index 02cff882a7..02cff882a7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-b/src/main/resources/service-b.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-b/src/main/resources/service-b.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-c/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-c/pom.xml
index dbd5d71285..dbd5d71285 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-c/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-c/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-c/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-service-c/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-c/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-c/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-service-c/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-c/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-c/src/main/resources/service-c.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-c/src/main/resources/service-c.composite
index d88db09b43..d88db09b43 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service-c/src/main/resources/service-c.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service-c/src/main/resources/service-c.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service/pom.xml
index 376d508393..376d508393 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
index a27e752fd7..a27e752fd7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
index 5334caeb55..5334caeb55 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml
index f5a904a225..f5a904a225 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-hazelcast/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-hazelcast/pom.xml
index 4df32fe711..4df32fe711 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-hazelcast/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-hazelcast/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeOneContributionTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeOneContributionTestCase.java
index 3755d0b365..3755d0b365 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeOneContributionTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeOneContributionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java
index c8ae6f3762..c8ae6f3762 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java
index 23c4a62916..23c4a62916 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
index a7e2bcf1c1..a7e2bcf1c1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-tribes/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-tribes/pom.xml
index e0d005db37..e0d005db37 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-tribes/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-tribes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java
index e55e8f63e4..e55e8f63e4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java
index 2d920c340a..2d920c340a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
index 888b4df156..888b4df156 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm/pom.xml
index 15d8e4d086..15d8e4d086 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java
index c8ae6f3762..c8ae6f3762 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java
index 23c4a62916..23c4a62916 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-node-test/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-node-test/pom.xml
index 480c654d33..480c654d33 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-node-test/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-node-test/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
index 93f5863010..93f5863010 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/pom.xml
index 34578e9749..34578e9749 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/remote-stop-start/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/remote-stop-start/pom.xml
index d99b75f85f..d99b75f85f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/remote-stop-start/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/remote-stop-start/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/remote-stop-start/src/main/java/itest/HelloworldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/remote-stop-start/src/main/java/itest/HelloworldService.java
index f97d2c3a83..f97d2c3a83 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/remote-stop-start/src/main/java/itest/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/remote-stop-start/src/main/java/itest/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/remote-stop-start/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/remote-stop-start/src/main/java/itest/HelloworldServiceImpl.java
index 4fd909af82..4fd909af82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/remote-stop-start/src/main/java/itest/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/remote-stop-start/src/main/java/itest/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/remote-stop-start/src/main/java/itest/RemoteHelloworldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/remote-stop-start/src/main/java/itest/RemoteHelloworldService.java
index d5b9dcf311..d5b9dcf311 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/remote-stop-start/src/main/java/itest/RemoteHelloworldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/remote-stop-start/src/main/java/itest/RemoteHelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/remote-stop-start/src/main/resources/Helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/remote-stop-start/src/main/resources/Helloworld.composite
index d37c93857d..d37c93857d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/remote-stop-start/src/main/resources/Helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/remote-stop-start/src/main/resources/Helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/remote-stop-start/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/remote-stop-start/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/remote-stop-start/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/remote-stop-start/src/test/java/test/scaclient/StopStartTestCase.java b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/remote-stop-start/src/test/java/test/scaclient/StopStartTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/remote-stop-start/src/test/java/test/scaclient/StopStartTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/build.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/three-nodes-three-vms-test/build.xml
index 3d77230541..3d77230541 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/build.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/three-nodes-three-vms-test/build.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/client.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/three-nodes-three-vms-test/client.xml
index 8e7c744940..8e7c744940 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/client.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/three-nodes-three-vms-test/client.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/three-nodes-three-vms-test/pom.xml
index 19817bf694..19817bf694 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/three-nodes-three-vms-test/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/server.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/three-nodes-three-vms-test/server.xml
index dc18cc8ce0..dc18cc8ce0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/server.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/three-nodes-three-vms-test/server.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/service-a-config.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/three-nodes-three-vms-test/service-a-config.xml
index d1a543aacc..d1a543aacc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/service-a-config.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/three-nodes-three-vms-test/service-a-config.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/service-b-config.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/three-nodes-three-vms-test/service-b-config.xml
index d557a31b64..d557a31b64 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/service-b-config.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/three-nodes-three-vms-test/service-b-config.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/service-c-config.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/three-nodes-three-vms-test/service-c-config.xml
index ba642c5ed0..ba642c5ed0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/service-c-config.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/three-nodes-three-vms-test/service-c-config.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceA.java b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceA.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceA.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceB.java b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceB.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceB.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceC.java b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceC.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceC.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-jvm-hazelcast/build.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-jvm-hazelcast/build.xml
index 2b245c3ab2..2b245c3ab2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-jvm-hazelcast/build.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-jvm-hazelcast/build.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-jvm-hazelcast/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-jvm-hazelcast/pom.xml
index 6aa70f9d9a..6aa70f9d9a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-jvm-hazelcast/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-jvm-hazelcast/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-jvm-hazelcast/src/main/java/org/apache/tuscany/sca/impl/Tuscany.java b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/two-jvm-hazelcast/src/main/java/org/apache/tuscany/sca/impl/Tuscany.java
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-client-contribution.jar b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-client-contribution.jar
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-iface-contribution.jar b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-iface-contribution.jar
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-service-contribution.jar b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/helloworld-service-contribution.jar
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/node-nodeClient/node.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/node-nodeClient/node.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/node-nodeService/node.xml b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/two-jvm-hazelcast/src/test/resources/domain-domain1/node-nodeService/node.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/two-nodes-test/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-test/pom.xml
index d2227f5650..d2227f5650 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-test/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-test/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
index 6da4c1f7e1..6da4c1f7e1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
index 4b034d89e0..4b034d89e0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java
index 998492734b..998492734b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java
index 7dfa6e66cc..7dfa6e66cc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
index 80c36e5ee9..80c36e5ee9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-two-vms-test/build.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-two-vms-test/build.xml
index fa7e963e87..fa7e963e87 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-two-vms-test/build.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-two-vms-test/build.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-two-vms-test/client-config.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-two-vms-test/client-config.xml
index 67642e0535..67642e0535 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-two-vms-test/client-config.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-two-vms-test/client-config.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-two-vms-test/client.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-two-vms-test/client.xml
index 8e7c744940..8e7c744940 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-two-vms-test/client.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-two-vms-test/client.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-two-vms-test/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-two-vms-test/pom.xml
index 1101f5a5c8..1101f5a5c8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-two-vms-test/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-two-vms-test/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-two-vms-test/server-config.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-two-vms-test/server-config.xml
index 590cf3bddb..590cf3bddb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-two-vms-test/server-config.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-two-vms-test/server-config.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-two-vms-test/server.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-two-vms-test/server.xml
index 05a5aa16e9..05a5aa16e9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-two-vms-test/server.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-two-vms-test/server.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
index 6af2cdce5d..6af2cdce5d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java b/sca-java-2.x/tags/2.0-Beta3/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-Beta3-RC2/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/oneway/build.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/oneway/build.xml
index 3a2a81460d..3a2a81460d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/oneway/build.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/oneway/build.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/oneway/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/oneway/pom.xml
index c3ab03017b..c3ab03017b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/oneway/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/oneway/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
index ecd239d5fb..ecd239d5fb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
index ba74b67d31..ba74b67d31 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
index 8ed3c3d638..8ed3c3d638 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
index 1c36073cf1..1c36073cf1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
index b375944bbd..b375944bbd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
index 1f771ea4ce..1f771ea4ce 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/operation-overloading/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/operation-overloading/pom.xml
index 5528a7f068..5528a7f068 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/operation-overloading/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/operation-overloading/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
index 1f589b44f4..1f589b44f4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
index a30d3611fb..a30d3611fb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
index 9ec60eb78f..9ec60eb78f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/operation-overloading/src/main/resources/OperationOverload.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/operation-overloading/src/main/resources/OperationOverload.composite
index cbf5aa2078..cbf5aa2078 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/operation-overloading/src/main/resources/OperationOverload.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/operation-overloading/src/main/resources/OperationOverload.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
index 62e5c14ce2..62e5c14ce2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/pom.xml
index 7e3f6f20df..7e3f6f20df 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java
index fd33be01d6..fd33be01d6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java
index 368179dc29..368179dc29 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java
index 05ea341466..05ea341466 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java
index c9f50d08ee..c9f50d08ee 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java
index cc7c555aff..cc7c555aff 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java
index 01cc8ac636..01cc8ac636 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java
index 943720451f..943720451f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java
index b712b99388..b712b99388 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/resources/Customer.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/resources/Customer.composite
index 7c66c741f6..7c66c741f6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/resources/Customer.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/resources/Customer.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/resources/LoggingMessages.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/resources/LoggingMessages.properties
index ada808be0e..ada808be0e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/resources/LoggingMessages.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/resources/LoggingMessages.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/resources/META-INF/definitions.xml
index ffcae358b1..ffcae358b1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/resources/META-INF/definitions.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/resources/META-INF/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/resources/META-INF/sca-contribution.xml
index d5d1840754..d5d1840754 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/resources/Payment.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/resources/Payment.composite
index 20124467b0..20124467b0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/main/resources/Payment.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/main/resources/Payment.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java
index 3385ee9071..3385ee9071 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy-transaction/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy-transaction/pom.xml
index 63b3946a62..63b3946a62 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy-transaction/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy-transaction/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy-transaction/src/main/java/customer/Customer.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy-transaction/src/main/java/customer/Customer.java
index b58547bf47..b58547bf47 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy-transaction/src/main/java/customer/Customer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy-transaction/src/main/java/customer/Customer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy-transaction/src/main/java/customer/CustomerRegistry.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy-transaction/src/main/java/customer/CustomerRegistry.java
index 4a05f0d0a8..4a05f0d0a8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy-transaction/src/main/java/customer/CustomerRegistry.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy-transaction/src/main/java/customer/CustomerRegistry.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy-transaction/src/main/java/customer/impl/CustomerRegistryImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy-transaction/src/main/java/customer/impl/CustomerRegistryImpl.java
index d2d6aa1f44..d2d6aa1f44 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy-transaction/src/main/java/customer/impl/CustomerRegistryImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy-transaction/src/main/java/customer/impl/CustomerRegistryImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy-transaction/src/main/resources/Customer.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy-transaction/src/main/resources/Customer.composite
index 7047de3663..7047de3663 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy-transaction/src/main/resources/Customer.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy-transaction/src/main/resources/Customer.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy-transaction/src/test/java/org/apache/tuscany/sca/itest/policy/transaction/CustomerTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy-transaction/src/test/java/org/apache/tuscany/sca/itest/policy/transaction/CustomerTestCase.java
index 2d83cd0ee5..2d83cd0ee5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy-transaction/src/test/java/org/apache/tuscany/sca/itest/policy/transaction/CustomerTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy-transaction/src/test/java/org/apache/tuscany/sca/itest/policy/transaction/CustomerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/pom.xml
index b0ada52cc3..b0ada52cc3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/helloworld/HelloWorld.java
index 1f5b8b365d..1f5b8b365d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/helloworld/HelloWorldClient.java
index 7a94a90b19..7a94a90b19 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/helloworld/HelloWorldException.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/helloworld/HelloWorldException.java
index b4a9fec640..b4a9fec640 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/helloworld/HelloWorldException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/helloworld/HelloWorldException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/helloworld/HelloWorldService.java
index 40c0c7618a..40c0c7618a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/helloworld/StatusImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/helloworld/StatusImpl.java
index 644853d6c2..644853d6c2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/helloworld/StatusImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/helloworld/StatusImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSAxisHandler.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSAxisHandler.java
index 686866e12d..686866e12d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSAxisHandler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSAxisHandler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicy.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicy.java
index c7803f03bc..c7803f03bc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicy.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicy.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyBuilder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyBuilder.java
index 4fdcde678d..4fdcde678d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyBuilder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyBuilder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyInterceptor.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyInterceptor.java
index aa33c74aea..aa33c74aea 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyProcessor.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyProcessor.java
index 2b013f7ba2..2b013f7ba2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyProviderFactory.java
index df626a10ff..df626a10ff 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyProviderReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyProviderReference.java
index 489c069ea8..489c069ea8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyProviderReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyProviderReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyProviderService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyProviderService.java
index 9880bf04b0..9880bf04b0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyProviderService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testbindingwspolicy/TestBindingWSPolicyProviderService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicy.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicy.java
index 651208fa76..651208fa76 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicy.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicy.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyBuilder.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyBuilder.java
index a7cceec4de..a7cceec4de 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyBuilder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyBuilder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyInterceptor.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyInterceptor.java
index 73b4ce2825..73b4ce2825 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProcessor.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProcessor.java
index 0916534248..0916534248 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderFactory.java
index 75cb298f2d..75cb298f2d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderImplementation.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderImplementation.java
index b027763d22..b027763d22 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderImplementation.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderImplementation.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderReference.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderReference.java
index 3e784aa62e..3e784aa62e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderService.java
index 5066193aa6..5066193aa6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.PolicyBuilder b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.PolicyBuilder
index d2138222a6..d2138222a6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.PolicyBuilder
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.PolicyBuilder
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index afe19cdffc..afe19cdffc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index f362b64a1f..f362b64a1f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index f5c82538be..f5c82538be 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/resources/definitions.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/resources/definitions.xml
index 3182ae65de..3182ae65de 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/resources/definitions.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/resources/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/resources/helloworld.composite
index 0edd2c2a7b..0edd2c2a7b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/resources/helloworld.wsdl
index 15b89dbcea..15b89dbcea 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/main/resources/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/test/java/interceptors/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/test/java/interceptors/HelloworldTestCase.java
index e34e4c6a35..e34e4c6a35 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/interceptors/src/test/java/interceptors/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/interceptors/src/test/java/interceptors/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/pom.xml
index 0e3477f947..0e3477f947 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java
index 16db3fd9fc..16db3fd9fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.java
index d34591713b..d34591713b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java
index 31a2d2cb89..31a2d2cb89 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml
index 6ae1c88c42..6ae1c88c42 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 45b6be47b7..45b6be47b7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml
index c70aae996b..c70aae996b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite
index 7dfe083bae..7dfe083bae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl
index a352696b8e..a352696b8e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java
index 5b1f971a3a..5b1f971a3a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/pom.xml
index 4141f2fe7b..4141f2fe7b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/pom.xml
index f5f2a61ea5..f5f2a61ea5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorld.java
index a9835199d0..a9835199d0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldClient.java
index 620adad638..620adad638 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldService.java
index b7955522f8..b7955522f8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/resources/LoggingMessages.properties b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/resources/LoggingMessages.properties
index ada808be0e..ada808be0e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/resources/LoggingMessages.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/resources/LoggingMessages.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/resources/META-INF/sca-contribution.xml
index 7e71dd465f..7e71dd465f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 961fdeb602..961fdeb602 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml
index 535c31d414..535c31d414 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.composite
index 5a3a8f09a8..5a3a8f09a8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.wsdl
index a352696b8e..a352696b8e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyTestCase.java
index 4d6921f8a1..4d6921f8a1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/policy/wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/policy/wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/pom.xml
index 69f70e3722..69f70e3722 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/pom.xml
index e3c844ad5e..e3c844ad5e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
index b0fd64c9da..b0fd64c9da 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
index 7b44ef02e4..7b44ef02e4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
index e8c4341cf2..e8c4341cf2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
index 68ce5a3cb6..68ce5a3cb6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
index c8d0d4cae4..c8d0d4cae4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
index b727935bc1..b727935bc1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
index e402131ce2..e402131ce2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
index 52f9871d1b..52f9871d1b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
index fceda9d9ae..fceda9d9ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
index 1642ab55f5..1642ab55f5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
index acd1f26670..acd1f26670 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
index 71dce41efc..71dce41efc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
index 9c7e8c3447..9c7e8c3447 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
index 64ca749e9f..64ca749e9f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
index a57ccd90c8..a57ccd90c8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
index c147a2affe..c147a2affe 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
index f44fed7389..f44fed7389 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
index 1d2e563095..1d2e563095 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
index 54082e297a..54082e297a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
index 15fb49ea4e..15fb49ea4e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
index 0a1d4a34a3..0a1d4a34a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/test/jaxb/props/package-info.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/test/jaxb/props/package-info.java
index 6a6fdd00cc..6a6fdd00cc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/java/test/jaxb/props/package-info.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/java/test/jaxb/props/package-info.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
index e697cedd62..e697cedd62 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/Outer.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/Outer.composite
index 93f164a1e7..93f164a1e7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/Outer.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/Outer.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/OuterPropertyTest.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/OuterPropertyTest.composite
index 0c8714cbe1..0c8714cbe1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/OuterPropertyTest.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/OuterPropertyTest.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/PropertyTest.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/PropertyTest.composite
index 7c834d5e0b..7c834d5e0b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/PropertyTest.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/PropertyTest.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/customer.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/customer.xsd
index 7421750f1b..7421750f1b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/customer.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/customer.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/fileProperty.txt b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/fileProperty.txt
index 7e932622ce..7e932622ce 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/fileProperty.txt
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/fileProperty.txt
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/foo.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/foo.xsd
index 6831f66cec..6831f66cec 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/foo.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/foo.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/manyValuesFileProperty.txt b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/manyValuesFileProperty.txt
index e037537d7d..e037537d7d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/manyValuesFileProperty.txt
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/mySimpleService.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/mySimpleService.composite
index 347990cca8..347990cca8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/mySimpleService.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/mySimpleService.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/rcProps.txt b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/rcProps.txt
index 052c291fd0..052c291fd0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/rcProps.txt
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/rcProps.txt
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/rcprops.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/rcprops.xsd
index 21289fa7b2..21289fa7b2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/main/resources/rcprops.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/main/resources/rcprops.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
index efc635c72b..efc635c72b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
index 0906a45ab3..0906a45ab3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
index eb217600db..eb217600db 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
index a0213ced46..a0213ced46 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/pom.xml
index 3f62baceb8..3f62baceb8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
index 986c8305dd..986c8305dd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
index 6cad998042..6cad998042 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
index a10a430473..a10a430473 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
index d00b016e34..d00b016e34 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
index 9ff53cca08..9ff53cca08 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
index cf8506b4e7..cf8506b4e7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
index 7386404e71..7386404e71 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
index 2dc13c4f42..2dc13c4f42 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/pom.xml
index 9e006945f1..9e006945f1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/java/policy/Target.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/Target.java
index 2366f6542a..2366f6542a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/java/policy/Target.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/Target.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
index b2d59e925c..b2d59e925c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
index 6f52dfb26e..6f52dfb26e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/java/recursive/Composer.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/Composer.java
index 18486115ae..18486115ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/java/recursive/Composer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/Composer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/java/recursive/ComposerClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
index 13c306d9b1..13c306d9b1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
index 3c432bc26a..3c432bc26a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
index 8b77484922..8b77484922 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/java/recursive/ComposerServer.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
index a123160d85..a123160d85 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/resources/Client.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Client.composite
index 50cbaa5086..50cbaa5086 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/resources/Client.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Client.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/resources/Inner.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Inner.composite
index df7130ba99..df7130ba99 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/resources/Inner.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Inner.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/resources/Outer.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Outer.composite
index 1c7d49f1c0..1c7d49f1c0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/resources/Outer.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Outer.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
index cb6e0cc358..cb6e0cc358 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
index 3f76efb11b..3f76efb11b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
index 3e78eb4533..3e78eb4533 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
index 6e686a579f..6e686a579f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/resources/policy/definitions.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/definitions.xml
index 923e1ad5f6..923e1ad5f6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/main/resources/policy/definitions.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
index a1b3eb3afa..a1b3eb3afa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
index 821a437d12..821a437d12 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
index 3852947223..3852947223 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
index 6ceeb3e3eb..6ceeb3e3eb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/pom.xml
index 18752a2fac..18752a2fac 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AService.java
index cecb2d83dd..cecb2d83dd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AServiceClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AServiceClient.java
index 2c746fcbb2..2c746fcbb2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AServiceClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplA.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplA.java
index 59c3768964..59c3768964 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplA.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplA.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplB.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplB.java
index 01b2c5d946..01b2c5d946 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplB.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplB.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/MutableObject.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/MutableObject.java
index 6fc28e36b2..6fc28e36b2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/MutableObject.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/MutableObject.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplA.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplA.java
index 43a9e71f44..43a9e71f44 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplA.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplA.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplB.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplB.java
index a0ad7746d7..a0ad7746d7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplB.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplB.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
index f8c0850118..f8c0850118 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
index cd0aad3eea..cd0aad3eea 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
index 785920bb2d..785920bb2d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
index 211e6160f6..211e6160f6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
index 47a1f9bde8..47a1f9bde8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
index d436c28adc..d436c28adc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
index a1823e1cdc..a1823e1cdc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
index 80617bdec2..80617bdec2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
index d181ac96ca..d181ac96ca 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/resources/AllowsPBRTest.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/resources/AllowsPBRTest.composite
index 98ebddafc0..98ebddafc0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/resources/AllowsPBRTest.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/resources/AllowsPBRTest.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/resources/AutoWiredReferencesTest.composite
index 14899fce62..14899fce62 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/resources/AutoWiredReferencesTest.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/resources/AutoWiredReferencesTest.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/resources/InnerReferencesTest.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/resources/InnerReferencesTest.composite
index 7048eaf371..7048eaf371 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/resources/InnerReferencesTest.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/resources/InnerReferencesTest.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/resources/ManualWiredReferencesTest.composite
index dbf72f67b6..dbf72f67b6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/main/resources/ManualWiredReferencesTest.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/main/resources/ManualWiredReferencesTest.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AllowsPBRTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AllowsPBRTestCase.java
index adabc65a25..adabc65a25 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AllowsPBRTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AllowsPBRTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
index 76264d308f..76264d308f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
index 6e4212fd9a..6e4212fd9a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
index 2fce95401e..2fce95401e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/samples/helloworld/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/samples/helloworld/pom.xml
index 020896ba86..020896ba86 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/samples/helloworld/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/samples/helloworld/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/samples/helloworld/src/test/java/itest/helloworld/Helloworld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/samples/helloworld/src/test/java/itest/helloworld/Helloworld.java
index 38dc80bed3..38dc80bed3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/samples/helloworld/src/test/java/itest/helloworld/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/samples/helloworld/src/test/java/itest/helloworld/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java
index dd46d68547..dd46d68547 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java
index 37950f1276..37950f1276 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/pom.xml
index 07148be28d..07148be28d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java
index 77c7cc0cbe..77c7cc0cbe 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyUnknownEndpointHandler.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyUnknownEndpointHandler.java
index 1b75cf5bf5..1b75cf5bf5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyUnknownEndpointHandler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyUnknownEndpointHandler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCABindingMapper b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCABindingMapper
index ef32d42058..ef32d42058 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCABindingMapper
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCABindingMapper
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.UnknownEndpointHandler b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.UnknownEndpointHandler
index 11828b7b2b..11828b7b2b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.UnknownEndpointHandler
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.UnknownEndpointHandler
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Helloworld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Helloworld.java
index 244d077f0b..244d077f0b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldClientImpl.java
index 8d69e1d31b..8d69e1d31b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldServiceImpl.java
index 12e194f6dc..12e194f6dc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java
index b6b6d406f8..b6b6d406f8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/UnknownEndpointTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/UnknownEndpointTestCase.java
index f35a71b30e..f35a71b30e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/UnknownEndpointTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/UnknownEndpointTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/test/resources/clients.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/test/resources/clients.composite
index 5597ec112c..5597ec112c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/test/resources/clients.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/test/resources/clients.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/test/resources/services.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/test/resources/services.composite
index bb1161c1ac..bb1161c1ac 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/test/resources/services.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/test/resources/services.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/test/resources/test.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/test/resources/test.composite
index d29c636f77..d29c636f77 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scabindingmapper/src/test/resources/test.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scabindingmapper/src/test/resources/test.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-jse-osgi/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-jse-osgi/pom.xml
index c5eaa6b83e..c5eaa6b83e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-jse-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-jse-osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java
index 1c7edaefb6..1c7edaefb6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java
index 7793bdd544..7793bdd544 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite
index 2d5ae6a57c..2d5ae6a57c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml
index 56e127b539..56e127b539 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
index 8bf162dfd9..8bf162dfd9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-osgi/META-INF/MANIFEST.MF
index ae6704f97d..ae6704f97d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-osgi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-osgi/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-osgi/pom.xml
index f96c2775f1..f96c2775f1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-osgi/src/main/java/itest/HelloworldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-osgi/src/main/java/itest/HelloworldService.java
index 1c7edaefb6..1c7edaefb6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-osgi/src/main/java/itest/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-osgi/src/main/java/itest/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-osgi/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-osgi/src/main/java/itest/HelloworldServiceImpl.java
index 3eecc59439..3eecc59439 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-osgi/src/main/java/itest/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-osgi/src/main/java/itest/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-osgi/src/main/resources/Helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-osgi/src/main/resources/Helloworld.composite
index 2d5ae6a57c..2d5ae6a57c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-osgi/src/main/resources/Helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-osgi/src/main/resources/Helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-osgi/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-osgi/src/main/resources/META-INF/sca-contribution.xml
index 56e127b539..56e127b539 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-osgi/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-osgi/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-osgi/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
index 431b2995aa..431b2995aa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-remote/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-remote/pom.xml
index cffbccc35e..cffbccc35e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-remote/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-remote/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java
index f97d2c3a83..f97d2c3a83 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java
index a04b40279f..a04b40279f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-remote/src/main/resources/Helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/resources/Helloworld.composite
index d37c93857d..d37c93857d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-remote/src/main/resources/Helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/resources/Helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml
index e178823296..e178823296 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java
index 432d51dc27..432d51dc27 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api/pom.xml
index dc12dd8072..dc12dd8072 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api/src/main/java/itest/HelloworldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api/src/main/java/itest/HelloworldService.java
index 1c7edaefb6..1c7edaefb6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api/src/main/java/itest/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api/src/main/java/itest/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
index 5af221313e..5af221313e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java
index a8640bf484..a8640bf484 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api/src/main/resources/Helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api/src/main/resources/Helloworld.composite
index 2d5ae6a57c..2d5ae6a57c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api/src/main/resources/Helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api/src/main/resources/Helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml
index 56e127b539..56e127b539 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
index c64350eb2a..c64350eb2a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-remote/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-remote/pom.xml
index 44910124cc..44910124cc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-remote/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-remote/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-remote/src/main/java/itest/HelloworldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-remote/src/main/java/itest/HelloworldService.java
index 708f313509..708f313509 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-remote/src/main/java/itest/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-remote/src/main/java/itest/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-remote/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-remote/src/main/java/itest/HelloworldServiceImpl.java
index 86ba76ff50..86ba76ff50 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-remote/src/main/java/itest/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-remote/src/main/java/itest/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-remote/src/main/java/itest/RemoteHelloworldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-remote/src/main/java/itest/RemoteHelloworldService.java
index a8640bf484..a8640bf484 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-remote/src/main/java/itest/RemoteHelloworldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-remote/src/main/java/itest/RemoteHelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-remote/src/main/resources/Helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-remote/src/main/resources/Helloworld.composite
index 2d5ae6a57c..2d5ae6a57c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-remote/src/main/resources/Helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-remote/src/main/resources/Helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-remote/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-remote/src/main/resources/META-INF/sca-contribution.xml
index 56e127b539..56e127b539 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-remote/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-remote/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-remote/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-remote/src/test/java/test/scaclient/SCAClientTestCase.java
index 4e3a15c862..4e3a15c862 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scaclient-remote/src/test/java/test/scaclient/SCAClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scaclient-remote/src/test/java/test/scaclient/SCAClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scdl/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scdl/pom.xml
index a122d6e118..a122d6e118 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scdl/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scdl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
index 64329a3303..64329a3303 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java
index 7dd52c5942..7dd52c5942 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
index 82b3706bc5..82b3706bc5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scdl/src/test/resources/sample-binding-sca-calculator-contribution.jar b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scdl/src/test/resources/sample-binding-sca-calculator-contribution.jar
index 8a79413c1b..8a79413c1b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scdl/src/test/resources/sample-binding-sca-calculator-contribution.jar
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scdl/src/test/resources/sample-binding-sca-calculator-contribution.jar
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scdl/src/test/resources/test.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scdl/src/test/resources/test.composite
index 6fa81b6e47..6fa81b6e47 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scdl/src/test/resources/test.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scdl/src/test/resources/test.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scopes/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scopes/pom.xml
index eef4867a7a..eef4867a7a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scopes/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scopes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
index 208ac3ba44..208ac3ba44 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
index e6bf08ccf2..e6bf08ccf2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scopes/src/main/resources/scopes.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scopes/src/main/resources/scopes.composite
index ed67bf5953..ed67bf5953 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scopes/src/main/resources/scopes.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scopes/src/main/resources/scopes.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
index 594bdd5038..594bdd5038 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/pom.xml
index 4934f0aaa5..4934f0aaa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java
index 8b5cf4d29a..8b5cf4d29a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java
index 3f68ac828a..3f68ac828a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java
index 18242cd594..18242cd594 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java
index dd143df036..dd143df036 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java
index fb436ae10c..fb436ae10c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java
index fc15b632d2..fc15b632d2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java
index 276093b69f..276093b69f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java
index 84e15b5eb2..84e15b5eb2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java
index db99472385..db99472385 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/resources/nodeA/CompositeA.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/resources/nodeA/CompositeA.composite
index 9a1fa0a7f7..9a1fa0a7f7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/resources/nodeA/CompositeA.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/resources/nodeA/CompositeA.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/resources/nodeB/CompositeB.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/resources/nodeB/CompositeB.composite
index a72f5949ed..a72f5949ed 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/resources/nodeB/CompositeB.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/resources/nodeB/CompositeB.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite
index bc5ede7605..bc5ede7605 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java
index 843afe207c..843afe207c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java
index 1a454c939a..1a454c939a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/pom.xml
index 4524118f2b..4524118f2b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
index 26e58dc530..26e58dc530 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
index 627ff4976f..627ff4976f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
index d04bd1b985..d04bd1b985 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
index 01df89a8fa..01df89a8fa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
index 07397e4502..07397e4502 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
index 8713e5ab22..8713e5ab22 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
index 842a85e000..842a85e000 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
index 8a3923b351..8a3923b351 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
index e52692fbf4..e52692fbf4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/resources/META-INF/sca-contribution.xml
index a687b3481a..a687b3481a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/resources/ServicesTest.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/resources/ServicesTest.composite
index 49fdf02f4b..49fdf02f4b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/main/resources/ServicesTest.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/main/resources/ServicesTest.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
index da779b2c54..da779b2c54 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/spi/build.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/spi/build.xml
index 1f169966d0..1f169966d0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/spi/build.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/spi/build.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/spi/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/spi/pom.xml
index 26260aa323..26260aa323 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/spi/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/spi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/spi/spi-safe.txt b/sca-java-2.x/tags/2.0-Beta3/testing/itest/spi/spi-safe.txt
index 3db3472d8b..3db3472d8b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/spi/spi-safe.txt
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/spi/spi-safe.txt
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/spi/src/test/java/org/apache/tuscany/sca/itest/spi/SPITestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/spi/src/test/java/org/apache/tuscany/sca/itest/spi/SPITestCase.java
index 2d2dc9dac5..2d2dc9dac5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/spi/src/test/java/org/apache/tuscany/sca/itest/spi/SPITestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/spi/src/test/java/org/apache/tuscany/sca/itest/spi/SPITestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/wires/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/wires/pom.xml
index 9bf44d7726..9bf44d7726 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/wires/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/wires/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
index f5a4337254..f5a4337254 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
index 82f0e26d58..82f0e26d58 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
index 67df1e3a52..67df1e3a52 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
index f0308252ba..f0308252ba 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/wires/src/main/resources/WireTest.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/wires/src/main/resources/WireTest.composite
index e697726a73..e697726a73 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/wires/src/main/resources/WireTest.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/wires/src/main/resources/WireTest.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
index 2a0095cabc..2a0095cabc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/README b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/README
index cf635e78d0..cf635e78d0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/README
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/README
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/pom.xml
index 654fe3941c..654fe3941c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java
index e712ec8b53..e712ec8b53 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java
index d09b2af230..d09b2af230 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java
index 652f7b53c4..652f7b53c4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java
index 85e55888c6..85e55888c6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
index 51f6dd4d51..51f6dd4d51 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
index 7e71dd465f..7e71dd465f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
index 67236a5f98..67236a5f98 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.composite
index 0188dc0d41..0188dc0d41 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
index f133cdfdef..f133cdfdef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java
index 7c63fd5ba9..7c63fd5ba9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml
index 7e71dd465f..7e71dd465f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl
index 78d8077bcd..78d8077bcd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl
index 0e6a10cc62..0e6a10cc62 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld.composite
index 0cd2b4419d..0cd2b4419d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-client/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-client/pom.xml
index 88fede5974..88fede5974 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java
index da40a7f442..da40a7f442 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl
index 11ed0a3353..11ed0a3353 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd
index 3c347570a0..3c347570a0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-service/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-service/pom.xml
index 94c79059c1..94c79059c1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-service/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-service/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java
index 796ef82792..796ef82792 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java
index ba7e033f63..ba7e033f63 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/launcher-ri/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/launcher-ri/pom.xml
index 12c3506a82..12c3506a82 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/launcher-ri/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/launcher-ri/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java
index 3c14218118..3c14218118 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCaseOFF.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCaseOFF.java
index a69fe483bf..a69fe483bf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCaseOFF.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCaseOFF.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/pom.xml
index 1267b5c594..1267b5c594 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws-jaxws/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws-jaxws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/README b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/README
index 0efac242c2..0efac242c2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/README
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/README
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/pom.xml
index 5f1222a8f3..5f1222a8f3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
index 98eb6e361b..98eb6e361b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
index 2c6c4fc92c..2c6c4fc92c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
index 885844260a..885844260a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml
index 7e71dd465f..7e71dd465f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 04fe620be4..04fe620be4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
index d4e651b271..d4e651b271 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
index 166565baa0..166565baa0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
index a352696b8e..a352696b8e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
index 380fc5b0f5..380fc5b0f5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/pom.xml
index 26765da5fa..26765da5fa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 6bc67db5fc..6bc67db5fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
index ba117c8cfd..ba117c8cfd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
index 3521fa5624..3521fa5624 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
index 057b884bc9..057b884bc9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
index 1ff58a29b0..1ff58a29b0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/HelloWorldServiceService_schema1.xsd
index acdfcaaaa5..acdfcaaaa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld-external-service.wsdl
index 837bcb059e..837bcb059e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld.composite
index 2be7fd7315..2be7fd7315 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/pom.xml
index 440db09733..440db09733 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 6bc67db5fc..6bc67db5fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
index ba117c8cfd..ba117c8cfd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
index 3521fa5624..3521fa5624 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
index 057b884bc9..057b884bc9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
index 1ff58a29b0..1ff58a29b0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/resources/HelloWorldServiceService_schema1.xsd
index acdfcaaaa5..acdfcaaaa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld-external-service.wsdl
index 837bcb059e..837bcb059e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld.composite
index 31414beb47..31414beb47 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/pom.xml
index 785c32b31c..785c32b31c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 6bc67db5fc..6bc67db5fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
index ba117c8cfd..ba117c8cfd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
index 3521fa5624..3521fa5624 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
index 057b884bc9..057b884bc9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
index 1ff58a29b0..1ff58a29b0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/HelloWorldServiceService_schema1.xsd
index acdfcaaaa5..acdfcaaaa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld-external-service.wsdl
index 837bcb059e..837bcb059e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld.composite
index 0d66bb105f..0d66bb105f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldcallbackservice-bottom.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldcallbackservice-bottom.composite
index e522c6c151..e522c6c151 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldcallbackservice-bottom.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldcallbackservice-bottom.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldservice-bottom.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldservice-bottom.composite
index aea84ad56e..aea84ad56e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldservice-bottom.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback-promotion/src/main/resources/helloworldservice-bottom.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/pom.xml
index fa0ef20f6c..fa0ef20f6c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 6bc67db5fc..6bc67db5fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
index ba117c8cfd..ba117c8cfd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
index 3521fa5624..3521fa5624 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
index 057b884bc9..057b884bc9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
index 1ff58a29b0..1ff58a29b0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/resources/HelloWorldServiceService_schema1.xsd
index acdfcaaaa5..acdfcaaaa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/resources/helloworld-external-service.wsdl
index 837bcb059e..837bcb059e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/resources/helloworld.composite
index cb257d22dd..cb257d22dd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-callback/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-callback/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
index 4d59bb0f37..4d59bb0f37 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 6bc67db5fc..6bc67db5fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
index 27471f87c6..27471f87c6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
index 6f3b430d6d..6f3b430d6d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.wsdl
index f5a25b39f8..f5a25b39f8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit1.xsd
index 545820a07d..545820a07d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit2.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit2.xsd
index d955cc2af4..d955cc2af4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit2.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit2.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldServiceService_schema1.xsd
index acdfcaaaa5..acdfcaaaa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld-external-service.wsdl
index 837bcb059e..837bcb059e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld.composite
index e00e130c32..e00e130c32 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/pom.xml
index 3e8085404f..3e8085404f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 9196530db7..9196530db7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
index c8bad91339..c8bad91339 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
index deb4dfc09d..deb4dfc09d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldBare.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldBare.java
index e37ff1aef3..e37ff1aef3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldBare.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldBare.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit.wsdl
index 03e0a8c93c..03e0a8c93c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit1.xsd
index 6238bf2f45..6238bf2f45 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit2.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit2.xsd
index d955cc2af4..d955cc2af4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit2.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit2.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd
index acdfcaaaa5..acdfcaaaa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/helloworld-external-service.wsdl
index 837bcb059e..837bcb059e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/helloworld.composite
index 5ae9e78823..5ae9e78823 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-doc-lit/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-doc-lit/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/pom.xml
index 0a1dd1f555..0a1dd1f555 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 6bc67db5fc..6bc67db5fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
index 8f57680d47..8f57680d47 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
index acdfcaaaa5..acdfcaaaa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
index 837bcb059e..837bcb059e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/resources/helloworld.composite
index e6cdb94dfb..e6cdb94dfb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-java-first/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-java-first/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/README b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/README
index fe73646e78..fe73646e78 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/README
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/README
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/pom.xml
index e135e52510..e135e52510 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index 6bc67db5fc..6bc67db5fc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
index 9ee8373468..9ee8373468 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
index 6f3b430d6d..6f3b430d6d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
index 0c11e6a8f4..0c11e6a8f4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd
index 8841f0dcf2..8841f0dcf2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd
index d955cc2af4..d955cc2af4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd
index acdfcaaaa5..acdfcaaaa5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld-external-service.wsdl
index 837bcb059e..837bcb059e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite
index 28dedef44c..28dedef44c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/pom.xml
index c1c2c6f683..c1c2c6f683 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
index c9c1038ea3..c9c1038ea3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
index d88a765682..d88a765682 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl
index 59fce9d849..59fce9d849 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd
index 2d8adf3d73..2d8adf3d73 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema2.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema2.xsd
index d955cc2af4..d955cc2af4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema2.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema2.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd
index 467eeb90c5..467eeb90c5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl
index c38f629e4f..c38f629e4f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite
index 8d0c7bf9ff..8d0c7bf9ff 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/pom.xml
index 5c8d9552bf..5c8d9552bf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java
index a1233f6d25..a1233f6d25 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java
index 0695ace7f4..0695ace7f4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
index f39566ccbf..f39566ccbf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldClient.java
index 332f825a51..332f825a51 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
index 3bbf50a728..3bbf50a728 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/resources/META-INF/sca-contribution.xml
index 7e71dd465f..7e71dd465f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.composite
index cae74697f1..cae74697f1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
index a352696b8e..a352696b8e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultsTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultsTestCase.java
index 1e4c1fcbff..1e4c1fcbff 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/defaults/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultsTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/defaults/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/pom.xml
index fcbea91dc1..fcbea91dc1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
index d6db1c2d0b..d6db1c2d0b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldComponent.java
index 4ba7e67de2..4ba7e67de2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
index 052b49ff55..052b49ff55 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.composite
index 1b0af55874..1b0af55874 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
index 1a2272d7ee..1a2272d7ee 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java
index f1cfe30475..f1cfe30475 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoint-references/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoint-references/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/pom.xml
index c630b61316..c630b61316 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldMultiService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldMultiService.java
index 8f77c63213..8f77c63213 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldMultiService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldMultiService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
index e248815805..e248815805 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM2.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM2.java
index 9d0a4ce5b4..9d0a4ce5b4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM2.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM2.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
index 8439696fa8..8439696fa8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
index 5b8578c816..5b8578c816 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiService.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiService.composite
index c7863a5ff8..c7863a5ff8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiService.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiService.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleService.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleService.composite
index 63c6a89cfb..63c6a89cfb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleService.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleService.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURI.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURI.composite
index 9991a415f9..9991a415f9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURI.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURI.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURI.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURI.composite
index 1ea7ab5a36..1ea7ab5a36 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURI.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURI.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-relative-uri.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-relative-uri.wsdl
index fe68755c47..fe68755c47 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-relative-uri.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-relative-uri.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-uri.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-uri.wsdl
index baa223f41c..baa223f41c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-uri.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-uri.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om.wsdl
index 73ca02246d..73ca02246d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/AbstractHelloWorldOMTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/AbstractHelloWorldOMTestCase.java
index bad94bbbc3..bad94bbbc3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/AbstractHelloWorldOMTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/AbstractHelloWorldOMTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiServiceTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiServiceTestCase.java
index 4ecf016e5a..4ecf016e5a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleServiceTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleServiceTestCase.java
index 13163d62ab..13163d62ab 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURITestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURITestCase.java
index bb492557d4..bb492557d4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURITestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURITestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURITestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURITestCase.java
index e038cc3116..e038cc3116 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURITestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURITestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-client/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-client/pom.xml
index cc29fd85c6..cc29fd85c6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java
index ccecf5695f..ccecf5695f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-client/src/main/resources/HelloWorldImplService.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-client/src/main/resources/HelloWorldImplService.wsdl
index d175589d7b..d175589d7b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-client/src/main/resources/HelloWorldImplService.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-client/src/main/resources/HelloWorldImplService.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd
index c9c0acb038..c9c0acb038 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/pom.xml
index 849931cd8a..849931cd8a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Bar.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Bar.java
index 1f330aa441..1f330aa441 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Bar.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Bar.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Foo.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Foo.java
index 1b22153169..1b22153169 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Foo.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Foo.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java
index 129365b5e4..129365b5e4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java
index 3a6266f1ef..3a6266f1ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml
index 67734bd676..67734bd676 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/Order.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/Order.java
index 2a4bb26858..2a4bb26858 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/Order.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/Order.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderService.java
index 718be0b46d..718be0b46d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBare.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBare.java
index b607250806..b607250806 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBare.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBare.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareForwardImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareForwardImpl.java
index 31af9e19f9..31af9e19f9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareForwardImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareForwardImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareImpl.java
index 05b8538c2a..05b8538c2a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceForwardImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceForwardImpl.java
index d14269fde2..d14269fde2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceForwardImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceForwardImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceImpl.java
index 8ec9a94248..8ec9a94248 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/Status.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/Status.java
index 83b198ab35..83b198ab35 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/Status.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/Status.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.bare.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.bare.composite
index 8a563666c8..8a563666c8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.bare.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.bare.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.composite
index 9d7d052472..9d7d052472 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceBareTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceBareTestCase.java
index 5da7e870ed..5da7e870ed 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceBareTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceBareTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceTestCase.java
index f762709a4c..f762709a4c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/README b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/README
index 41dcb8680b..41dcb8680b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/README
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/README
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/pom.xml
index 0e83678e76..0e83678e76 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
index 98eb6e361b..98eb6e361b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
index 2c6c4fc92c..2c6c4fc92c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
index 3662007984..3662007984 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/META-INF/sca-contribution.xml
index 7e71dd465f..7e71dd465f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 04fe620be4..04fe620be4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
index d7251590ba..d7251590ba 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
index aa21221b30..aa21221b30 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
index a352696b8e..a352696b8e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/tuscany.jks b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/tuscany.jks
index d67bccdf8b..d67bccdf8b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/tuscany.jks
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/tuscany.jks
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java
index d58f761b79..d58f761b79 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/pom.xml
index 0f9f97e008..0f9f97e008 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackForwardSpecTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackForwardSpecTestCase.java
index aaf9504116..aaf9504116 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackForwardSpecTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackForwardSpecTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackFullSpecTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackFullSpecTestCase.java
index a8980c8031..a8980c8031 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackFullSpecTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackFullSpecTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackPromotionTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackPromotionTestCase.java
index 8c26e5c54a..8c26e5c54a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackPromotionTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackPromotionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackTestCase.java
index 3bd65d549a..3bd65d549a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitTestCase.java
index a7fb6d6125..a7fb6d6125 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitWrappedTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitWrappedTestCase.java
index 95e61ccc1b..95e61ccc1b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitWrappedTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitWrappedTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/JavaFirstTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/JavaFirstTestCase.java
index 77418f331f..77418f331f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/JavaFirstTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/JavaFirstTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/RpcLitTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/RpcLitTestCase.java
index 9f74dd47b8..9f74dd47b8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/RpcLitTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/RpcLitTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java
index 7ed4829d85..7ed4829d85 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/pom.xml
index 823689b6c9..823689b6c9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackForwardSpecTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackForwardSpecTestCase.java
index d349e450c2..d349e450c2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackForwardSpecTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackForwardSpecTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackFullSpecTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackFullSpecTestCase.java
index 0e0e6e93ba..0e0e6e93ba 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackFullSpecTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackFullSpecTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackPromotionTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackPromotionTestCase.java
index 09697f82ba..09697f82ba 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackPromotionTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackPromotionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackTestCase.java
index 49ba20c20b..49ba20c20b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/DocLitWrappedTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/DocLitWrappedTestCase.java
index a85007e019..a85007e019 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/DocLitWrappedTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/DocLitWrappedTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/JavaFirstTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/JavaFirstTestCase.java
index 0aa6a71db4..0aa6a71db4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/JavaFirstTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/JavaFirstTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/WSDLFirstTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/WSDLFirstTestCase.java
index c8566bfa3b..c8566bfa3b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/WSDLFirstTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/WSDLFirstTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/pom.xml
index 1f27d5cce8..1f27d5cce8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/pom.xml
index 680e4e7b2d..680e4e7b2d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Account.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Account.java
index 963712c0c2..963712c0c2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Account.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Account.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AccountService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AccountService.java
index ab5fc0f873..ab5fc0f873 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AccountService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AccountService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java
index 6f6a374450..6f6a374450 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
index d6db1c2d0b..d6db1c2d0b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
index e248815805..e248815805 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
index 8439696fa8..8439696fa8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
index 5b8578c816..5b8578c816 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
index 052b49ff55..052b49ff55 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/package-info.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/package-info.java
index 805a515382..805a515382 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/package-info.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/package-info.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd
index 2479f3dbe5..2479f3dbe5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdefs.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdefs.xsd
index 24cf3eebad..24cf3eebad 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdefs.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdefs.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerinfo.xsd b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerinfo.xsd
index b78909142f..b78909142f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerinfo.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerinfo.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.composite
index c520d2e3b2..c520d2e3b2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.wsdl
index 29be66fb71..29be66fb71 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
index 1a2272d7ee..1a2272d7ee 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import-nested.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import-nested.wsdl
index 686b08a1d4..686b08a1d4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import-nested.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import-nested.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import.wsdl
index 105c82a411..105c82a411 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl
index 7a7a4033ce..7a7a4033ce 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite
index 65270b8d6c..65270b8d6c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite
index 02395c4615..02395c4615 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite
index 6b06cec722..6b06cec722 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldWSDLMergedTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldWSDLMergedTestCase.java
index bc69473abe..bc69473abe 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldWSDLMergedTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldWSDLMergedTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
index e48e1bc050..e48e1bc050 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
index 173d952b0e..173d952b0e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
index 635c49b8ab..635c49b8ab 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/README b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/README
index 60a1b09598..60a1b09598 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/README
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/README
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/pom.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/pom.xml
index a8319557c8..a8319557c8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
index 057b00a21c..057b00a21c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
index 212617af6a..212617af6a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
index b1ecba682b..b1ecba682b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/ServerPWCBHandler.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/ServerPWCBHandler.java
index 4ada132172..4ada132172 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/ServerPWCBHandler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/ServerPWCBHandler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/META-INF/sca-contribution.xml
index 350ad6be96..350ad6be96 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 04fe620be4..04fe620be4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/helloworldKeys.jks b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/helloworldKeys.jks
index e2184ad3c6..e2184ad3c6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/helloworldKeys.jks
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/helloworldKeys.jks
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
index 95089c39f3..95089c39f3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
index 463979ef6f..463979ef6f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
index 15b89dbcea..15b89dbcea 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
index 610f9e4bd5..610f9e4bd5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/testing/itest/ws/wspolicy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java