Moving 2.x branches

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

90 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/pom.xml
index b221647929..b221647929 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/pom.xml
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
index e78736d4df..e78736d4df 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
index f4271d0d92..f4271d0d92 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
index d7ecbb7427..d7ecbb7427 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
index be7ea97eac..be7ea97eac 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
index 19a8b86f28..19a8b86f28 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
index 15672f9ee0..15672f9ee0 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
index 31479f1848..31479f1848 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
index b6359f348b..b6359f348b 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
index 9e8b64e3b9..9e8b64e3b9 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
index acf262512e..acf262512e 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
index b1439770da..b1439770da 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
index dae4152333..dae4152333 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
index d1a30fd305..d1a30fd305 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
index 7732b3865f..7732b3865f 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java
index 9bda00413b..9bda00413b 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
index 1bbc1fa4eb..1bbc1fa4eb 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
index 6a66e73569..6a66e73569 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
index 24dbad3d4a..24dbad3d4a 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
index b9785fa657..b9785fa657 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
index dc546a81a0..dc546a81a0 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
index 01260c67f1..01260c67f1 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
index 78dfe7221f..78dfe7221f 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
index 6120b815d5..6120b815d5 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
index 50feee41d6..50feee41d6 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
index 67dd77ce7b..67dd77ce7b 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
index fd19c8d7b1..fd19c8d7b1 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
index c3b2e04ff2..c3b2e04ff2 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
index 0298b39825..0298b39825 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
index 4374306609..4374306609 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java
index d487c94fd3..d487c94fd3 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
index 164397bf6b..164397bf6b 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
index d71c89d565..d71c89d565 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java
index 5dcaf9c06f..5dcaf9c06f 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
index 4b2ee3a838..4b2ee3a838 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
index 88059ccb45..88059ccb45 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
index 691dc80632..691dc80632 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
index 7c691efa8d..7c691efa8d 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
index 272484a6f0..272484a6f0 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
index d9c4866466..d9c4866466 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
index 1c2d20ff94..1c2d20ff94 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
index 5dd429077d..5dd429077d 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
index b263eb869b..b263eb869b 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
index 4f08ac7a1b..4f08ac7a1b 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
index 11c896a06d..11c896a06d 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java
index 00984ae565..00984ae565 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
index 802c9c30db..802c9c30db 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
index e66ea5d537..e66ea5d537 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
index 4d93d2279d..4d93d2279d 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
index cd8c589a59..cd8c589a59 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
index d2d9956103..d2d9956103 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
index 6c69330ce5..6c69330ce5 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
index 72c08e8344..72c08e8344 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
index 144f7f3d00..144f7f3d00 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
index ace06b245c..ace06b245c 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback.composite
index 4623f17ca2..4623f17ca2 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback.composite
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
index 2680370c5b..2680370c5b 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/pom.xml
index 83bfa96a30..83bfa96a30 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/pom.xml
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
index 39719539ba..39719539ba 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
index b5911101b8..b5911101b8 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
index 1730f863b5..1730f863b5 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
index ac40c56ee6..ac40c56ee6 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
index bac842dfca..bac842dfca 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
index 3c4eea4bc9..3c4eea4bc9 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
index 1e5a459954..1e5a459954 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
index 25e7154fca..25e7154fca 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
index d3cb107a61..d3cb107a61 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/pom.xml
index ed3c07ae7c..ed3c07ae7c 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/pom.xml
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
index f5249b3a5b..f5249b3a5b 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
index 635e6e74d4..635e6e74d4 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
index b28a31da38..b28a31da38 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
index ab186ee7eb..ab186ee7eb 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
index 020d18b862..020d18b862 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
index c339ebd6ea..c339ebd6ea 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
index 18d592f9d0..18d592f9d0 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
index 71e09c38b3..71e09c38b3 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
index e182613932..e182613932 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
index 15a4ab3b76..15a4ab3b76 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
index 21ee8acac1..21ee8acac1 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
index 52c11b881c..52c11b881c 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/pom.xml
index 611f4945b9..611f4945b9 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/pom.xml
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
index bd19b504d9..bd19b504d9 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
index c404b91673..c404b91673 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
index d9f32dcfea..d9f32dcfea 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
index 920d1294b3..920d1294b3 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
index 98cf59c084..98cf59c084 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
index 5f223dfcf0..5f223dfcf0 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
index a8500dfb09..a8500dfb09 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
index 929fe06115..929fe06115 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/pom.xml
index 30f365e6ad..30f365e6ad 100644
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M2/vtest/java-api/conversation/pom.xml