Renaming branch

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

150 files changed, 0 insertions, 0 deletions

diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversational/pom.xml b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/pom.xml
index 2b612731fd..2b612731fd 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversational/pom.xml
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/pom.xml
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
index bc7212f70c..bc7212f70c 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
index 76c857126a..76c857126a 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
index b67d89d3e2..b67d89d3e2 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
index 55d87c9546..55d87c9546 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
index 457b18e60a..457b18e60a 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
index d6252f0a0c..d6252f0a0c 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
index 4c2de35d52..4c2de35d52 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
index c00d5f1c10..c00d5f1c10 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/pom.xml b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/pom.xml
index 9531468e8f..9531468e8f 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/pom.xml
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/pom.xml
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
index a3f1f11826..a3f1f11826 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
index 8a1ed23b9d..8a1ed23b9d 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
index 1d215100f7..1d215100f7 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
index cd4f29ea5b..cd4f29ea5b 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
index 64b99c9f98..64b99c9f98 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
index 0d34b802e1..0d34b802e1 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
index 762c9533d0..762c9533d0 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
index 3ebf63ba54..3ebf63ba54 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
index 3820240ee2..3820240ee2 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
index 75573b838d..75573b838d 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
index 8349e775c5..8349e775c5 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
index 9d5aec8ed5..9d5aec8ed5 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
index 49391b3353..49391b3353 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
index d3573176a3..d3573176a3 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
index c10369c9bd..c10369c9bd 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
index b9d10732e7..b9d10732e7 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
index 4ebd667a00..4ebd667a00 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/destroy/pom.xml b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/pom.xml
index 57477d1bbb..57477d1bbb 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/destroy/pom.xml
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/pom.xml
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
index 039689805c..039689805c 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
index 0b30bb8644..0b30bb8644 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
index 33b2e01bcb..33b2e01bcb 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
index d5630e859e..d5630e859e 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
index b8f384704a..b8f384704a 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
index 75a00447f3..75a00447f3 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
index b03a0defe5..b03a0defe5 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
index 93aafdd971..93aafdd971 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
index eb8f6e59ca..eb8f6e59ca 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
index 296a386876..296a386876 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
index 4373bc2558..4373bc2558 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
index f3b2f28200..f3b2f28200 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/endsconversation/pom.xml b/branches/sca-trunk-20080910/vtest/java-api/annotations/endsconversation/pom.xml
index 8cd14ed0a5..8cd14ed0a5 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/endsconversation/pom.xml
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/endsconversation/pom.xml
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
index 13bcb1fd51..13bcb1fd51 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
index 5400c1fe0d..5400c1fe0d 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
index ed564ddbdc..ed564ddbdc 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
index 418fb93c68..418fb93c68 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
index cbc13e380c..cbc13e380c 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
index 1ddd711a31..1ddd711a31 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/init/pom.xml b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/pom.xml
index b2393947f8..b2393947f8 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/init/pom.xml
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/pom.xml
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
index edf13010f5..edf13010f5 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
index 5d53510462..5d53510462 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
index 43c1a8cffa..43c1a8cffa 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
index f5cac472c0..f5cac472c0 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
index b7c17ee535..b7c17ee535 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
index c2adea1426..c2adea1426 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
index 01b8e101e0..01b8e101e0 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
index 4ae38d44b6..4ae38d44b6 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
index 6bc3d8e7fc..6bc3d8e7fc 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
index 7ade16e6d3..7ade16e6d3 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
index 35f13a2ae6..35f13a2ae6 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
index 0dbccd8611..0dbccd8611 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/oneway/pom.xml b/branches/sca-trunk-20080910/vtest/java-api/annotations/oneway/pom.xml
index 18d22a913b..18d22a913b 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/oneway/pom.xml
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/oneway/pom.xml
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
index 6fef2afa2a..6fef2afa2a 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
index 1cb4f3adf5..1cb4f3adf5 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
index 4829ffb95f..4829ffb95f 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
index 09c783ae96..09c783ae96 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
index 47a7a98c7d..47a7a98c7d 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
index f2fb8d0dc8..f2fb8d0dc8 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/pom.xml b/branches/sca-trunk-20080910/vtest/java-api/annotations/pom.xml
index 2755583358..2755583358 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/pom.xml
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/pom.xml
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/property/pom.xml b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/pom.xml
index 3d4781846a..3d4781846a 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/property/pom.xml
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/pom.xml
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
index 5cfea1b099..5cfea1b099 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
index 5ddc59f8b6..5ddc59f8b6 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
index 99fb842a9a..99fb842a9a 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
index 5de3b5fcff..5de3b5fcff 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
index f30c4c69fc..f30c4c69fc 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
index b385083533..b385083533 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
index fd1ba5ee52..fd1ba5ee52 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
index f22f4a35b7..f22f4a35b7 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
index 280d2275f8..280d2275f8 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
index 6bc4384e73..6bc4384e73 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
index 6715b64fad..6715b64fad 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
index e10f07b0be..e10f07b0be 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
index 9a23e2de8d..9a23e2de8d 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
index b4797595ac..b4797595ac 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/resources/property.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/resources/property.composite
index f7af170f33..f7af170f33 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/property/src/main/resources/property.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/main/resources/property.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
index d5fbc568f7..d5fbc568f7 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/reference/pom.xml b/branches/sca-trunk-20080910/vtest/java-api/annotations/reference/pom.xml
index 261abb3ab9..261abb3ab9 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/reference/pom.xml
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/reference/pom.xml
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
index b28704a3b4..b28704a3b4 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
index 53b376d369..53b376d369 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
index 67299d322d..67299d322d 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
index a819dfd87d..a819dfd87d 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
index e8611d510f..e8611d510f 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/reference/src/main/resources/ab.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/reference/src/main/resources/ab.composite
index b4ad1e77d5..b4ad1e77d5 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/reference/src/main/resources/ab.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/reference/src/main/resources/ab.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
index 1fe50b4ea7..1fe50b4ea7 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/pom.xml b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/pom.xml
index d7de001183..d7de001183 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/pom.xml
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/pom.xml
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
index b7cf3fba71..b7cf3fba71 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
index 7da9d29424..7da9d29424 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
index 208c6a78b0..208c6a78b0 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
index d4cedcc979..d4cedcc979 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
index 7844ba7b62..7844ba7b62 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
index 7a047414dc..7a047414dc 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
index 555cdd5be0..555cdd5be0 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
index 79e20a3879..79e20a3879 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
index 95813f0e32..95813f0e32 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
index b4c95965ff..b4c95965ff 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
index 5c0fc12fa3..5c0fc12fa3 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
index ab6a3f946a..ab6a3f946a 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
index c544bf6e02..c544bf6e02 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
index 0104030f2e..0104030f2e 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
index 9c17b06b16..9c17b06b16 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
index 2a8bd80e9a..2a8bd80e9a 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
index c99f5f5e74..c99f5f5e74 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
index cc41994106..cc41994106 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
index 4fb7386484..4fb7386484 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
index 994469cb3a..994469cb3a 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
index 2fa610def7..2fa610def7 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
index 12566dc5e4..12566dc5e4 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
index a5851598a0..a5851598a0 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
index 7088562c57..7088562c57 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
index 274e0570d9..274e0570d9 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
index 681b0b3776..681b0b3776 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
index 98b94a33c7..98b94a33c7 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
index 8cf39a072c..8cf39a072c 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/resources/scope.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/resources/scope.composite
index 7c195b2b5d..7c195b2b5d 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/main/resources/scope.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/main/resources/scope.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
index 9821af4a27..9821af4a27 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/pom.xml b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/pom.xml
index a5162ea4d3..a5162ea4d3 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/pom.xml
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/pom.xml
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
index a923faf5ae..a923faf5ae 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
index 26bcf3b9db..26bcf3b9db 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
index 4f4f1e80c7..4f4f1e80c7 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
index ffabb3619c..ffabb3619c 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
index 83d7980dbc..83d7980dbc 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
index a416e33de7..a416e33de7 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
index ad44d2b93a..ad44d2b93a 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
index 52886131a1..52886131a1 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
index bd1a3a5fe6..bd1a3a5fe6 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
index 0f8c7dabcb..0f8c7dabcb 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
index e50e230bd4..e50e230bd4 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
index e3a1462f88..e3a1462f88 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
index 0ab2e29194..0ab2e29194 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
index 7ce2235719..7ce2235719 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
index 9c3f15743c..9c3f15743c 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
index 3fc23d2f68..3fc23d2f68 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
index 4cc9430c74..4cc9430c74 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
index a64d434a46..a64d434a46 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
index 49f34738ef..49f34738ef 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
index 46370b7e19..46370b7e19 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
index a86d6e1da0..a86d6e1da0 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
index ac525ea669..ac525ea669 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
index f2760b96ab..f2760b96ab 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/resources/service.composite b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/resources/service.composite
index 0731986df2..0731986df2 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/main/resources/service.composite
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/main/resources/service.composite
diff --git a/branches/trunk-20080910/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
index 52f7821ebb..52f7821ebb 100644
--- a/branches/trunk-20080910/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
+++ b/branches/sca-trunk-20080910/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java