60 files changed, 0 insertions, 0 deletions
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/callablereference/pom.xml b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/callablereference/pom.xml
index df49fc64ac..df49fc64ac 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/callablereference/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/callablereference/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
index a7040f944e..a7040f944e 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
index 707568e507..707568e507 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
index 18fcaee6ee..18fcaee6ee 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
index 70a257d19f..70a257d19f 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
index ea4c71d27a..ea4c71d27a 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
index f997d78bb5..f997d78bb5 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
index 4d0d8338ba..4d0d8338ba 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/pom.xml b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/pom.xml
index f44c896479..f44c896479 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
index b2c8c07866..b2c8c07866 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
index 7e425c740f..7e425c740f 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
index d7799bb3aa..d7799bb3aa 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
index d0da012f6f..d0da012f6f 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
index 079d859f74..079d859f74 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
index 06a71c29ac..06a71c29ac 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
index e508687965..e508687965 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
index 157864fd27..157864fd27 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
index 9432c70ff3..9432c70ff3 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
index 19f110d5dc..19f110d5dc 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
index e9352a5c06..e9352a5c06 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/conversation/pom.xml b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/conversation/pom.xml
index 3e0f1c609f..3e0f1c609f 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/conversation/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/conversation/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
index 845c10303e..845c10303e 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
index a3148aa0d7..a3148aa0d7 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
index 7160121388..7160121388 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
index c487559ca1..c487559ca1 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/resources/conversation.composite b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
index 87cab2f479..87cab2f479 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
index 9b46ac5e08..9b46ac5e08 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/pom.xml b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/pom.xml
index 48588acb19..48588acb19 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
index 90582e88a2..90582e88a2 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
index c1c1c6544c..c1c1c6544c 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
index 11886277ad..11886277ad 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
index 466a32731a..466a32731a 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
index c0aed7a707..c0aed7a707 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
index 82873ed96d..82873ed96d 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
index 1190e6900f..1190e6900f 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
index eca4b54109..eca4b54109 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
index 57a34716e6..57a34716e6 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
index c1f5a56a9a..c1f5a56a9a 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/resources/exception.composite b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/resources/exception.composite
index 5bd933ce96..5bd933ce96 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/resources/exception.composite
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/main/resources/exception.composite
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
index da7b1da0fa..da7b1da0fa 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/pom.xml b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/pom.xml
index 1f74f0e39a..1f74f0e39a 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/pom.xml b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/pom.xml
index efb0474579..efb0474579 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
index 6fec5cada3..6fec5cada3 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
index 4dd2088f90..4dd2088f90 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
index d913e95a53..d913e95a53 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
index 5d3cbf6e3d..5d3cbf6e3d 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
index d358736daa..d358736daa 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
index 4aa5eeb25a..4aa5eeb25a 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
index e3b761bd37..e3b761bd37 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/pom.xml b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/pom.xml
index 57822d856d..57822d856d 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
index 6de5d6810e..6de5d6810e 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
index f8c5c1272f..f8c5c1272f 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
index 65a444d100..65a444d100 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
index 28c90e2071..28c90e2071 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
index 86dc80a4e1..86dc80a4e1 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
index c5af80291e..c5af80291e 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
index 563d3ceab6..563d3ceab6 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java
index ba3edf13ae..ba3edf13ae 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
index 9bded61947..9bded61947 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
diff --git a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
index fda917d60a..fda917d60a 100644
--- a/sca-java-1.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java