150 files changed, 0 insertions, 0 deletions

diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/pom.xml
index b9fa0ff9b9..b9fa0ff9b9 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
index bc7212f70c..bc7212f70c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
index 76c857126a..76c857126a 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
index 23791f2ca9..23791f2ca9 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
index b8e346681c..b8e346681c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
index 75bac4bf18..75bac4bf18 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
index 860d60b0de..860d60b0de 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
index 4c2de35d52..4c2de35d52 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
index c00d5f1c10..c00d5f1c10 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/pom.xml
index 0c0236b440..0c0236b440 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
index a3f1f11826..a3f1f11826 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
index 7290c31f1a..7290c31f1a 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
index d38ca0276c..d38ca0276c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
index 5db8768398..5db8768398 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
index a0a654920d..a0a654920d 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
index 2f711be74d..2f711be74d 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
index f9aa1de8bd..f9aa1de8bd 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
index cc1c0d18fd..cc1c0d18fd 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
index 3820240ee2..3820240ee2 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
index 75573b838d..75573b838d 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
index 8349e775c5..8349e775c5 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
index 9d5aec8ed5..9d5aec8ed5 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
index 49391b3353..49391b3353 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
index d3573176a3..d3573176a3 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
index c10369c9bd..c10369c9bd 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesTestCase.java
index 952194430e..952194430e 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
index 4ebd667a00..4ebd667a00 100644
--- a/java/sca-contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/pom.xml
index d0e306867f..d0e306867f 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
index 636e7fd8fc..636e7fd8fc 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
index e790c9e6d2..e790c9e6d2 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
index 1d874007b2..1d874007b2 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
index bf4b0736ca..bf4b0736ca 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
index a320e6b3ff..a320e6b3ff 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
index 4c77104866..4c77104866 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
index b03a0defe5..b03a0defe5 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
index 93aafdd971..93aafdd971 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
index eb8f6e59ca..eb8f6e59ca 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
index 296a386876..296a386876 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
index 4373bc2558..4373bc2558 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
index 72834a6803..72834a6803 100644
--- a/java/sca-contrib/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/pom.xml
index 9c763a1111..9c763a1111 100644
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
index 13bcb1fd51..13bcb1fd51 100644
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
index 01d3ef051e..01d3ef051e 100644
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
index 606020cf85..606020cf85 100644
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
index 56644c6967..56644c6967 100644
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
index cbc13e380c..cbc13e380c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
index 61d7e25187..61d7e25187 100644
--- a/java/sca-contrib/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/init/pom.xml
index 9700b6870c..9700b6870c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
index 9f6b9bcffd..9f6b9bcffd 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
index c48b2e2070..c48b2e2070 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
index 532b1d16eb..532b1d16eb 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
index b69a2541b0..b69a2541b0 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
index 76f905cff0..76f905cff0 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
index 14c0e9c2da..14c0e9c2da 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
index 01b8e101e0..01b8e101e0 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
index 4ae38d44b6..4ae38d44b6 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
index 6bc3d8e7fc..6bc3d8e7fc 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
index 7ade16e6d3..7ade16e6d3 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
index 35f13a2ae6..35f13a2ae6 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
index 6ee7b8de89..6ee7b8de89 100644
--- a/java/sca-contrib/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/pom.xml
index 99f1420712..99f1420712 100644
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
index b68cd53167..b68cd53167 100644
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
index 1cb4f3adf5..1cb4f3adf5 100644
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
index d95ea22456..d95ea22456 100644
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
index 4f63a23429..4f63a23429 100644
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
index 47a7a98c7d..47a7a98c7d 100644
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
index f2fb8d0dc8..f2fb8d0dc8 100644
--- a/java/sca-contrib/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/pom.xml
index 402ea03f7a..402ea03f7a 100644
--- a/java/sca-contrib/vtest/java-api/annotations/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/property/pom.xml
index 0c36e98879..0c36e98879 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
index 5cfea1b099..5cfea1b099 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
index 5ddc59f8b6..5ddc59f8b6 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
index c39d4e2504..c39d4e2504 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
index 5de3b5fcff..5de3b5fcff 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
index f30c4c69fc..f30c4c69fc 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
index 6dd91b598d..6dd91b598d 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
index b6d51ef253..b6d51ef253 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
index d6a36f54a9..d6a36f54a9 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
index ace9da2904..ace9da2904 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
index 4396b6ce32..4396b6ce32 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
index cd459f2dd1..cd459f2dd1 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
index c22ee08f95..c22ee08f95 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
index 02892ca7f3..02892ca7f3 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
index ed2c3dc365..ed2c3dc365 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/main/resources/property.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/resources/property.composite
index f7af170f33..f7af170f33 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/main/resources/property.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/main/resources/property.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
index d5fbc568f7..d5fbc568f7 100644
--- a/java/sca-contrib/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/pom.xml
index 5e88742f3e..5e88742f3e 100644
--- a/java/sca-contrib/vtest/java-api/annotations/reference/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
index b28704a3b4..b28704a3b4 100644
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
index 04c0bc377e..04c0bc377e 100644
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
index 60e2b2408c..60e2b2408c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
index 20fccf807f..20fccf807f 100644
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
index c7fc91e65f..c7fc91e65f 100644
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/resources/ab.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/resources/ab.composite
index b4ad1e77d5..b4ad1e77d5 100644
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/main/resources/ab.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/main/resources/ab.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
index 1fe50b4ea7..1fe50b4ea7 100644
--- a/java/sca-contrib/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/pom.xml
index 8a905a7ebc..8a905a7ebc 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
index b7cf3fba71..b7cf3fba71 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
index 7da9d29424..7da9d29424 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
index 208c6a78b0..208c6a78b0 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
index f9b87ad251..f9b87ad251 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
index 0e4ed9c18d..0e4ed9c18d 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
index 566dc93e6d..566dc93e6d 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
index 714b3ce8f4..714b3ce8f4 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
index 88cf95b593..88cf95b593 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
index ea974100ab..ea974100ab 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
index 454009da12..454009da12 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
index 2910b1c81c..2910b1c81c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
index 81d0692d7a..81d0692d7a 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
index 3493a88206..3493a88206 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
index 982568b236..982568b236 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
index f7a57941dc..f7a57941dc 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
index 29d6284c43..29d6284c43 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
index 037d900176..037d900176 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
index d5f1326086..d5f1326086 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
index e2bfa3c45a..e2bfa3c45a 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
index 28b8bd84b9..28b8bd84b9 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
index 404f329201..404f329201 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
index 66d14c2e96..66d14c2e96 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
index 80546f677c..80546f677c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
index 022a9d11f6..022a9d11f6 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
index 196cd6f39a..196cd6f39a 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
index acc7d8ca9e..acc7d8ca9e 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
index b9d799331f..b9d799331f 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
index 60178ba2a3..60178ba2a3 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/resources/scope.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/resources/scope.composite
index 7c195b2b5d..7c195b2b5d 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/main/resources/scope.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/main/resources/scope.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
index 6d65416ce8..6d65416ce8 100644
--- a/java/sca-contrib/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/pom.xml b/sca-java-2.x/contrib/vtest/java-api/annotations/service/pom.xml
index 4c018607d1..4c018607d1 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/pom.xml
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/pom.xml
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
index 7b89b31d7f..7b89b31d7f 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
index 26bcf3b9db..26bcf3b9db 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
index 4f4f1e80c7..4f4f1e80c7 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
index ffabb3619c..ffabb3619c 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
index 83d7980dbc..83d7980dbc 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
index a416e33de7..a416e33de7 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
index ad44d2b93a..ad44d2b93a 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
index 52886131a1..52886131a1 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
index bd1a3a5fe6..bd1a3a5fe6 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
index 0f8c7dabcb..0f8c7dabcb 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
index 6a80e3023e..6a80e3023e 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
index cdeb43c4f4..cdeb43c4f4 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
index 0ab2e29194..0ab2e29194 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
index b9617e5780..b9617e5780 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
index 474ca084d6..474ca084d6 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
index 3fc23d2f68..3fc23d2f68 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
index 5b3c73ddd8..5b3c73ddd8 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
index 321d019932..321d019932 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
index f28fa0c3a7..f28fa0c3a7 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
index 79051eea8f..79051eea8f 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
index 161cbaa620..161cbaa620 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
index 02e67b645b..02e67b645b 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
index ea08149eaf..ea08149eaf 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/main/resources/service.composite b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/resources/service.composite
index 0731986df2..0731986df2 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/main/resources/service.composite
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/main/resources/service.composite
diff --git a/java/sca-contrib/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
index 52f7821ebb..52f7821ebb 100644
--- a/java/sca-contrib/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
+++ b/sca-java-2.x/contrib/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java