36 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
index a3b83dfc14..a3b83dfc14 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
index 946ad93d7d..946ad93d7d 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
index 27939e3996..27939e3996 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
index 7887417e55..7887417e55 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
index 735bcee176..735bcee176 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
index 1c5d2cdbb8..1c5d2cdbb8 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
index cebbea0701..cebbea0701 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
index 3f04e9f09e..3f04e9f09e 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
index 9ca4abb9d3..9ca4abb9d3 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index 734fb9fe7b..734fb9fe7b 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index 99f4c85d8f..99f4c85d8f 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index fb4ecb56e7..fb4ecb56e7 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index 21a4db737e..21a4db737e 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index 48c1644b87..48c1644b87 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
index 2c205c2cae..2c205c2cae 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
index 48c203ab35..48c203ab35 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index 614c0a96b5..614c0a96b5 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
index 86a96aaa75..86a96aaa75 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
index b56186ea88..b56186ea88 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
index f394770ffc..f394770ffc 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
index b94e8a6452..b94e8a6452 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
index 737c2940dd..737c2940dd 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index 8f2736ad2d..8f2736ad2d 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index 8b3a8663d8..8b3a8663d8 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index ae8bee8040..ae8bee8040 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index 3784dfd53e..3784dfd53e 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
index 5823b7d050..5823b7d050 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index c9c5138515..c9c5138515 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 134ffda75d..134ffda75d 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
index 73a6d7d27e..73a6d7d27e 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index 5bafa5e075..5bafa5e075 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
index 8d63ebbbef..8d63ebbbef 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index ecf108c656..ecf108c656 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
index ee09e99f1b..ee09e99f1b 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
index ad0c1fb7da..ad0c1fb7da 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
index 55390189cf..55390189cf 100644
--- a/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java