273 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-1.x/tags/2.0-M1/itest/build-was-integration.xml b/sca-java-2.x/tags/2.0-M1/itest/build-was-integration.xml
index 03de4c050f..03de4c050f 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/build-was-integration.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/build-was-integration.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-api/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/callback-api/pom.xml
index 71dabe0c3e..71dabe0c3e 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-api/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-api/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/sca-java-2.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
index b013462f9f..b013462f9f 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/sca-java-2.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
index 252e4dc45f..252e4dc45f 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/sca-java-2.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
index d883dc2d6f..d883dc2d6f 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/sca-java-2.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
index afb7c45e2c..afb7c45e2c 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
index bdac56d222..bdac56d222 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-api/src/main/resources/CallBackApiTest.composite b/sca-java-2.x/tags/2.0-M1/itest/callback-api/src/main/resources/CallBackApiTest.composite
index 946c4862ee..946c4862ee 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-api/src/main/resources/CallBackApiTest.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-api/src/main/resources/CallBackApiTest.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
index 19eb25631e..19eb25631e 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
index 75fab95efb..75fab95efb 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/pom.xml
index c1d4974091..c1d4974091 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 291a72b9d6..291a72b9d6 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 19f366c423..19f366c423 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index 4bb6b29a8d..4bb6b29a8d 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index 5396879e83..5396879e83 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 07010f61e1..07010f61e1 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
index c506956088..c506956088 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
index adf28214f6..adf28214f6 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
index 43b812faed..43b812faed 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/pom.xml
index 6d16d3f3f3..6d16d3f3f3 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
index 627d37e27d..627d37e27d 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
index 966ad17b9a..966ad17b9a 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
index d2dc0add75..d2dc0add75 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
index e3fb7d6238..e3fb7d6238 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
index f7a1a195ed..f7a1a195ed 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
index 3f48f16389..3f48f16389 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
index ff38134df5..ff38134df5 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
index 5c2b4d4388..5c2b4d4388 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-id/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/callback-id/pom.xml
index b3879c4e50..b3879c4e50 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-id/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-id/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/sca-java-2.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
index 643cb3beb8..643cb3beb8 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/sca-java-2.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
index 6e5a0c7654..6e5a0c7654 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/sca-java-2.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
index aaf99a534b..aaf99a534b 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/sca-java-2.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
index cc7907f6ae..cc7907f6ae 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
index 4f04959b9d..4f04959b9d 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-id/src/main/resources/CallBackIdClient.composite b/sca-java-2.x/tags/2.0-M1/itest/callback-id/src/main/resources/CallBackIdClient.composite
index c9a6ba6258..c9a6ba6258 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-id/src/main/resources/CallBackIdClient.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-id/src/main/resources/CallBackIdClient.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
index 56fd46d1b0..56fd46d1b0 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/pom.xml
index aa2c5c9e81..aa2c5c9e81 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
index 7c80d222fc..7c80d222fc 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
index 0fe34b9d68..0fe34b9d68 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
index 6b455a1f5b..6b455a1f5b 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
index 66758a1e73..66758a1e73 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
index f198efae51..f198efae51 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
index 49df5aa17a..49df5aa17a 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
index 3dae3ca3a8..3dae3ca3a8 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
index bd3cce74b4..bd3cce74b4 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-separatethread/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/callback-separatethread/pom.xml
index 185575094f..185575094f 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-separatethread/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-separatethread/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/sca-java-2.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
index dc66003604..dc66003604 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/sca-java-2.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
index f03144db8a..f03144db8a 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/sca-java-2.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
index 137ea6a658..137ea6a658 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/sca-java-2.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
index a00578427c..a00578427c 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
index 692ffbe8dd..692ffbe8dd 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/sca-java-2.x/tags/2.0-M1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
index e111e5074c..e111e5074c 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
index c216cab1be..c216cab1be 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/pom.xml
index 5da3ddcf71..5da3ddcf71 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
index e54b9b4004..e54b9b4004 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
index f80401836e..f80401836e 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
index a15bcd90ae..a15bcd90ae 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
index 3e72b7ef3c..3e72b7ef3c 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
index 6fd13eec5f..6fd13eec5f 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
index 08c8b94a2f..08c8b94a2f 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
index afedcdf7f1..afedcdf7f1 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
index 78bc793c81..78bc793c81 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
index 3552ddecab..3552ddecab 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
index 5aaf596d85..5aaf596d85 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/pom.xml
index 90beb9e570..90beb9e570 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
index 77837fdb77..77837fdb77 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
index 825d1d6486..825d1d6486 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
index b5c3e6e8b8..b5c3e6e8b8 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
index 12a206affa..12a206affa 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
index bd17731fa1..bd17731fa1 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
index f7c718adab..f7c718adab 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
index 74c19961ba..74c19961ba 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
index d79b9278e2..d79b9278e2 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
index ce73417f94..ce73417f94 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
index a61682da06..a61682da06 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/component-type/pom.xml
index c15cb3ec23..c15cb3ec23 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/AddService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/CalculatorClient.java
index 6f978bd9be..6f978bd9be 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
index 1209ac128a..1209ac128a 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/DivideService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/resources/Calculator.composite
index b229787657..b229787657 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/resources/Calculator.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
index 00c48e5a35..00c48e5a35 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
index 74bedc0a98..74bedc0a98 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
index 289fcc3e11..289fcc3e11 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 2d8a879cda..2d8a879cda 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
index 6214955141..6214955141 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
index ac3ccc3d08..ac3ccc3d08 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/conversations/pom.xml
index 79304fe65f..79304fe65f 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
index a3b83dfc14..a3b83dfc14 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
index 946ad93d7d..946ad93d7d 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
index 27939e3996..27939e3996 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
index 7887417e55..7887417e55 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
index 735bcee176..735bcee176 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
index 1c5d2cdbb8..1c5d2cdbb8 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
index cebbea0701..cebbea0701 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
index 3f04e9f09e..3f04e9f09e 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
index 9ca4abb9d3..9ca4abb9d3 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index 734fb9fe7b..734fb9fe7b 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index 99f4c85d8f..99f4c85d8f 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index fb4ecb56e7..fb4ecb56e7 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index 21a4db737e..21a4db737e 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index 48c1644b87..48c1644b87 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
index 2c205c2cae..2c205c2cae 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
index 48c203ab35..48c203ab35 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index 614c0a96b5..614c0a96b5 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
index 86a96aaa75..86a96aaa75 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
index b56186ea88..b56186ea88 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
index f394770ffc..f394770ffc 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
index b94e8a6452..b94e8a6452 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
index 737c2940dd..737c2940dd 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index 8f2736ad2d..8f2736ad2d 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index 8b3a8663d8..8b3a8663d8 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index ae8bee8040..ae8bee8040 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index 3784dfd53e..3784dfd53e 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
index 137dfc4108..137dfc4108 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index c9c5138515..c9c5138515 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 134ffda75d..134ffda75d 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
index 73a6d7d27e..73a6d7d27e 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index 5bafa5e075..5bafa5e075 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
index 8d63ebbbef..8d63ebbbef 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index ecf108c656..ecf108c656 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
index ee09e99f1b..ee09e99f1b 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
index ad0c1fb7da..ad0c1fb7da 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
index 55390189cf..55390189cf 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/resources/ConversationAge.composite b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/resources/ConversationAge.composite
index abd1c35ced..abd1c35ced 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/resources/ConversationAge.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/resources/ConversationAge.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/resources/ConversationUniqueId.composite b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/resources/ConversationUniqueId.composite
index 831449a079..831449a079 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/resources/ConversationUniqueId.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/resources/ConversationUniqueId.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/resources/conversationId.composite b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/resources/conversationId.composite
index e61eb08194..e61eb08194 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/resources/conversationId.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/resources/conversationId.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/resources/conversationLifetime.composite b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/resources/conversationLifetime.composite
index 3b79dc43d9..3b79dc43d9 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/resources/conversationLifetime.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/resources/conversationLifetime.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/resources/conversational.composite b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/resources/conversational.composite
index 4da3ce74d5..4da3ce74d5 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/main/resources/conversational.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/main/resources/conversational.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
index e64a9acbe2..e64a9acbe2 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
index 2b1aea3ff3..2b1aea3ff3 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
index f9bb69aa30..f9bb69aa30 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
index a686754d3a..a686754d3a 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
index ee1bf84fc4..ee1bf84fc4 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
index 56bca7ac78..56bca7ac78 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/distribution/bin-distro-unzip/build.xml b/sca-java-2.x/tags/2.0-M1/itest/distribution/bin-distro-unzip/build.xml
index 5f04a612d8..5f04a612d8 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/distribution/bin-distro-unzip/build.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/distribution/bin-distro-unzip/build.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/distribution/bin-distro-unzip/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/distribution/bin-distro-unzip/pom.xml
index 16a30620b5..16a30620b5 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/distribution/bin-distro-unzip/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/distribution/bin-distro-unzip/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/distribution/binding-ws-calculator/build.xml b/sca-java-2.x/tags/2.0-M1/itest/distribution/binding-ws-calculator/build.xml
index 6a8f555d49..6a8f555d49 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/distribution/binding-ws-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/distribution/binding-ws-calculator/build.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/distribution/binding-ws-calculator/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/distribution/binding-ws-calculator/pom.xml
index ed33973b01..ed33973b01 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/distribution/binding-ws-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/distribution/binding-ws-calculator/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/distribution/calculator-rmi/build.xml b/sca-java-2.x/tags/2.0-M1/itest/distribution/calculator-rmi/build.xml
index 6ff60f29bb..6ff60f29bb 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/distribution/calculator-rmi/build.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/distribution/calculator-rmi/build.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/distribution/calculator-rmi/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/distribution/calculator-rmi/pom.xml
index e021b1b9c5..e021b1b9c5 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/distribution/calculator-rmi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/distribution/calculator-rmi/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/distribution/implementation-java-calculator/build.xml b/sca-java-2.x/tags/2.0-M1/itest/distribution/implementation-java-calculator/build.xml
index 311a2001ca..311a2001ca 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/distribution/implementation-java-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/distribution/implementation-java-calculator/build.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/distribution/implementation-java-calculator/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/distribution/implementation-java-calculator/pom.xml
index 710a21fd75..710a21fd75 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/distribution/implementation-java-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/distribution/implementation-java-calculator/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/distribution/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/distribution/pom.xml
index 580b29e788..580b29e788 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/distribution/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/distribution/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/exceptions/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/exceptions/pom.xml
index a012d4e236..a012d4e236 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/exceptions/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/exceptions/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
index 1f57116bac..1f57116bac 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
index 112aefc747..112aefc747 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
index 53a6c70b57..53a6c70b57 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
index ace219991b..ace219991b 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
index 453528444d..453528444d 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
index 26b9f0a383..26b9f0a383 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
index cd62338841..cd62338841 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
index 56b9fc6f5b..56b9fc6f5b 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
index c5b54ff902..c5b54ff902 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/resources/ExceptionTest.composite b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/resources/ExceptionTest.composite
index d27797c2fe..d27797c2fe 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/main/resources/ExceptionTest.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/main/resources/ExceptionTest.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
index 7794348476..7794348476 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/interfaces/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/interfaces/pom.xml
index c80a276ae4..c80a276ae4 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/interfaces/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/interfaces/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
index f4131593d5..f4131593d5 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
index 5fc9ed51b3..5fc9ed51b3 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
index 6cd937af12..6cd937af12 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
index 05a9d09bdd..05a9d09bdd 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
index ab0b18191c..ab0b18191c 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
index 724d94dffb..724d94dffb 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
index be3fa4c15a..be3fa4c15a 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
index 9f34dfd274..9f34dfd274 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
index 541b1f1508..541b1f1508 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
index b29b298ab6..b29b298ab6 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
index 00a0f5645b..00a0f5645b 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/resources/InterfacesTest.composite b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/resources/InterfacesTest.composite
index 0361d8c83c..0361d8c83c 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/main/resources/InterfacesTest.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/main/resources/InterfacesTest.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
index 57ba18d0d6..57ba18d0d6 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/operation-overloading/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/operation-overloading/pom.xml
index efead87521..efead87521 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/operation-overloading/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/operation-overloading/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/sca-java-2.x/tags/2.0-M1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
index 1f589b44f4..1f589b44f4 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/sca-java-2.x/tags/2.0-M1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
index a30d3611fb..a30d3611fb 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/sca-java-2.x/tags/2.0-M1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
index 9ec60eb78f..9ec60eb78f 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/operation-overloading/src/main/resources/OperationOverload.composite b/sca-java-2.x/tags/2.0-M1/itest/operation-overloading/src/main/resources/OperationOverload.composite
index cbf5aa2078..cbf5aa2078 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/operation-overloading/src/main/resources/OperationOverload.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/operation-overloading/src/main/resources/OperationOverload.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/sca-java-2.x/tags/2.0-M1/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
index 62e5c14ce2..62e5c14ce2 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/pom.xml
index b2363cee14..b2363cee14 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/properties/pom.xml
index 91607ddf02..91607ddf02 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
index b0fd64c9da..b0fd64c9da 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
index 7b44ef02e4..7b44ef02e4 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
index e8c4341cf2..e8c4341cf2 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
index 68ce5a3cb6..68ce5a3cb6 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
index c8d0d4cae4..c8d0d4cae4 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
index b727935bc1..b727935bc1 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
index e402131ce2..e402131ce2 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
index 52f9871d1b..52f9871d1b 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
index fceda9d9ae..fceda9d9ae 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
index 87f87d6c22..87f87d6c22 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
index acd1f26670..acd1f26670 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
index 71dce41efc..71dce41efc 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
index 5217ede572..5217ede572 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
index 5f8f28e46a..5f8f28e46a 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
index a57ccd90c8..a57ccd90c8 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
index c147a2affe..c147a2affe 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
index 7c700903d6..7c700903d6 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
index 1d2e563095..1d2e563095 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
index 54082e297a..54082e297a 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
index 15fb49ea4e..15fb49ea4e 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
index 0a1d4a34a3..0a1d4a34a3 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/test/jaxb/props/package-info.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/test/jaxb/props/package-info.java
index 6a6fdd00cc..6a6fdd00cc 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/java/test/jaxb/props/package-info.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/java/test/jaxb/props/package-info.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
index 70a251fa16..70a251fa16 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/Outer.composite b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/Outer.composite
index b3e529e8b5..b3e529e8b5 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/Outer.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/Outer.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/OuterPropertyTest.composite b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/OuterPropertyTest.composite
index 5237e964a3..5237e964a3 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/OuterPropertyTest.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/OuterPropertyTest.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/PropertyTest.composite b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/PropertyTest.composite
index 75deddbdad..75deddbdad 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/PropertyTest.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/PropertyTest.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/customer.xsd b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/customer.xsd
index 8861d7e7b8..8861d7e7b8 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/customer.xsd
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/customer.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/fileProperty.txt b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/fileProperty.txt
index 0d3d9ead83..0d3d9ead83 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/fileProperty.txt
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/fileProperty.txt
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/manyValuesFileProperty.txt b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/manyValuesFileProperty.txt
index 450f397b30..450f397b30 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/manyValuesFileProperty.txt
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/mySimpleService.composite b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/mySimpleService.composite
index 75fdd24add..75fdd24add 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/mySimpleService.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/mySimpleService.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/rcProps.txt b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/rcProps.txt
index 052c291fd0..052c291fd0 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/rcProps.txt
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/rcProps.txt
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/rcprops.xsd b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/rcprops.xsd
index 21289fa7b2..21289fa7b2 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/main/resources/rcprops.xsd
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/main/resources/rcprops.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
index efc635c72b..efc635c72b 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
index da1ec5186f..da1ec5186f 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
index caf5a5e052..caf5a5e052 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
index a0213ced46..a0213ced46 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/pom.xml
index 1962371779..1962371779 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
index 986c8305dd..986c8305dd 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
index 6cad998042..6cad998042 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
index 261eff2584..261eff2584 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
index f3c9280f96..f3c9280f96 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
index 975f61c664..975f61c664 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
index f9bbcc76d8..f9bbcc76d8 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
index 09fd10fb7e..09fd10fb7e 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
index da14cdef13..da14cdef13 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/references/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/references/pom.xml
index 581d56aab1..581d56aab1 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/references/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/references/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
index f8c0850118..f8c0850118 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
index 49c3deb84d..49c3deb84d 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
index 785920bb2d..785920bb2d 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
index 211e6160f6..211e6160f6 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
index 47a1f9bde8..47a1f9bde8 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
index d436c28adc..d436c28adc 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
index a1823e1cdc..a1823e1cdc 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
index 80617bdec2..80617bdec2 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
index d181ac96ca..d181ac96ca 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/resources/AutoWiredReferencesTest.composite
index 894f6681c2..894f6681c2 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/resources/AutoWiredReferencesTest.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/resources/AutoWiredReferencesTest.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/resources/InnerReferencesTest.composite b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/resources/InnerReferencesTest.composite
index 6cadc52c13..6cadc52c13 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/resources/InnerReferencesTest.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/resources/InnerReferencesTest.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/resources/ManualWiredReferencesTest.composite
index 708960974b..708960974b 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/references/src/main/resources/ManualWiredReferencesTest.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/references/src/main/resources/ManualWiredReferencesTest.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
index 1034bda02d..1034bda02d 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
index db2e3f175d..db2e3f175d 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
index 6349e4f827..6349e4f827 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/scopes/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/scopes/pom.xml
index 19e8bd32ec..19e8bd32ec 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/scopes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/scopes/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/sca-java-2.x/tags/2.0-M1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
index 208ac3ba44..208ac3ba44 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java b/sca-java-2.x/tags/2.0-M1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
index ff116070b5..ff116070b5 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/sca-java-2.x/tags/2.0-M1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
index e6bf08ccf2..e6bf08ccf2 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/scopes/src/main/resources/scopes.composite b/sca-java-2.x/tags/2.0-M1/itest/scopes/src/main/resources/scopes.composite
index 54a1b66830..54a1b66830 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/scopes/src/main/resources/scopes.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/scopes/src/main/resources/scopes.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
index 959a6067ee..959a6067ee 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/services/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/services/pom.xml
index b89dee99cb..b89dee99cb 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/services/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/services/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
index 26e58dc530..26e58dc530 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
index 627ff4976f..627ff4976f 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
index d04bd1b985..d04bd1b985 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
index 01df89a8fa..01df89a8fa 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
index 07397e4502..07397e4502 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
index 8713e5ab22..8713e5ab22 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
index 842a85e000..842a85e000 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
index 8a3923b351..8a3923b351 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
index 59ffce8205..59ffce8205 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/resources/META-INF/sca-contribution.xml
index 37ea8f677d..37ea8f677d 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/resources/ServicesTest.composite b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/resources/ServicesTest.composite
index eda885f9ec..eda885f9ec 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/services/src/main/resources/ServicesTest.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/services/src/main/resources/ServicesTest.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
index da779b2c54..da779b2c54 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/wasAdmin.py b/sca-java-2.x/tags/2.0-M1/itest/wasAdmin.py
index 2be2b1eff7..2be2b1eff7 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/wasAdmin.py
+++ b/sca-java-2.x/tags/2.0-M1/itest/wasAdmin.py
diff --git a/sca-java-1.x/tags/2.0-M1/itest/wires/pom.xml b/sca-java-2.x/tags/2.0-M1/itest/wires/pom.xml
index 6ff4931748..6ff4931748 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/wires/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/itest/wires/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java b/sca-java-2.x/tags/2.0-M1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
index f5a4337254..f5a4337254 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/sca-java-2.x/tags/2.0-M1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
index 82f0e26d58..82f0e26d58 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java b/sca-java-2.x/tags/2.0-M1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
index 67df1e3a52..67df1e3a52 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java b/sca-java-2.x/tags/2.0-M1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
index f0308252ba..f0308252ba 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/itest/wires/src/main/resources/WireTest.composite b/sca-java-2.x/tags/2.0-M1/itest/wires/src/main/resources/WireTest.composite
index 8b764d0e7d..8b764d0e7d 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/wires/src/main/resources/WireTest.composite
+++ b/sca-java-2.x/tags/2.0-M1/itest/wires/src/main/resources/WireTest.composite
diff --git a/sca-java-1.x/tags/2.0-M1/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java b/sca-java-2.x/tags/2.0-M1/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
index 2a0095cabc..2a0095cabc 100644
--- a/sca-java-1.x/tags/2.0-M1/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java