Moving 1.x trunk

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

81 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.x/itest/conversations-ws/pom.xml b/sca-java-1.x/trunk/itest/conversations-ws/pom.xml
index 91c26b447b..91c26b447b 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/pom.xml
+++ b/sca-java-1.x/trunk/itest/conversations-ws/pom.xml
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
index 9cd88620e3..9cd88620e3 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
index 53dadc3dc7..53dadc3dc7 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index cb7a032e85..cb7a032e85 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index 2532346349..2532346349 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index 8f008fa711..8f008fa711 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index 1e36ce6917..1e36ce6917 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index b4d3fe3d71..b4d3fe3d71 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index ed3a01c10b..ed3a01c10b 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index 1603916cca..1603916cca 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index accc1eee27..accc1eee27 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index 90f6de86ac..90f6de86ac 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index 3f7a90b3dc..3f7a90b3dc 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
index ab91498132..ab91498132 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index e4f83656de..e4f83656de 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 8fe7c5b6ba..8fe7c5b6ba 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
index 9f4857f703..9f4857f703 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index 4b06251414..4b06251414 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
index be039748fc..be039748fc 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index 42f2f1a603..42f2f1a603 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
index a852aeda56..a852aeda56 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
index d5a1ff7410..d5a1ff7410 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/Conversational/conversational.composite b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
index c4da99145d..c4da99145d 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
index 20a92c9dc7..20a92c9dc7 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
index 73d078674c..73d078674c 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
index 9c6b0a2b34..9c6b0a2b34 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
index 9df966ebc2..9df966ebc2 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
index ebd1e55dac..ebd1e55dac 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
index 2c16145f54..2c16145f54 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
index 4166e6acdf..4166e6acdf 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
index 6023b7cd53..6023b7cd53 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
index fb3a3cec6f..fb3a3cec6f 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
index 5fbe2c3f69..5fbe2c3f69 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations/pom.xml b/sca-java-1.x/trunk/itest/conversations/pom.xml
index 7240bfe6df..7240bfe6df 100644
--- a/branches/sca-java-1.x/itest/conversations/pom.xml
+++ b/sca-java-1.x/trunk/itest/conversations/pom.xml
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
index a3b83dfc14..a3b83dfc14 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
index 8e98b9cbd4..8e98b9cbd4 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
index e7583c339a..e7583c339a 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
index bc4a5fc571..bc4a5fc571 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
index 77d7f4c007..77d7f4c007 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
index e422938b27..e422938b27 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
index a6dbf56797..a6dbf56797 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
index 3f04e9f09e..3f04e9f09e 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
index 53dadc3dc7..53dadc3dc7 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index 8cad88d2f4..8cad88d2f4 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index 2532346349..2532346349 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index 8f008fa711..8f008fa711 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index 546382cfd1..546382cfd1 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index f1a21cc18f..f1a21cc18f 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
index 74afbfb763..74afbfb763 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
index 5f97b16088..5f97b16088 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index 3ce3e3ada7..3ce3e3ada7 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
index 95c9c7ae6e..95c9c7ae6e 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
index a5f37f7a52..a5f37f7a52 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
index c1e27641ef..c1e27641ef 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
index 900b8f743f..900b8f743f 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
index b21f956bd9..b21f956bd9 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index 9deef312ac..9deef312ac 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index cffa76186a..cffa76186a 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index 1272c7ab7f..1272c7ab7f 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index 847b038881..847b038881 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
index b77e4c0194..b77e4c0194 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index 5b3906fc2c..5b3906fc2c 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 8fe7c5b6ba..8fe7c5b6ba 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
index 9a25f0f59a..9a25f0f59a 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index efcbdff06f..efcbdff06f 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
index 8454b3846b..8454b3846b 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index 07186c91e1..07186c91e1 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
index 344aa99dff..344aa99dff 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
index 8d79bb75e8..8d79bb75e8 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
index d1b769216b..d1b769216b 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/resources/ConversationAge.composite b/sca-java-1.x/trunk/itest/conversations/src/main/resources/ConversationAge.composite
index abd1c35ced..abd1c35ced 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/resources/ConversationAge.composite
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/resources/ConversationAge.composite
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/resources/ConversationUniqueId.composite b/sca-java-1.x/trunk/itest/conversations/src/main/resources/ConversationUniqueId.composite
index 831449a079..831449a079 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/resources/ConversationUniqueId.composite
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/resources/ConversationUniqueId.composite
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/resources/conversationId.composite b/sca-java-1.x/trunk/itest/conversations/src/main/resources/conversationId.composite
index e61eb08194..e61eb08194 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/resources/conversationId.composite
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/resources/conversationId.composite
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/resources/conversationLifetime.composite b/sca-java-1.x/trunk/itest/conversations/src/main/resources/conversationLifetime.composite
index 3b79dc43d9..3b79dc43d9 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/resources/conversationLifetime.composite
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/resources/conversationLifetime.composite
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/resources/conversational.composite b/sca-java-1.x/trunk/itest/conversations/src/main/resources/conversational.composite
index 4da3ce74d5..4da3ce74d5 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/resources/conversational.composite
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/resources/conversational.composite
diff --git a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
index 3e750bdd1e..3e750bdd1e 100644
--- a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
index 326a833a42..326a833a42 100644
--- a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
index 431962221a..431962221a 100644
--- a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
index cc31c77873..cc31c77873 100644
--- a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
index 8480e04028..8480e04028 100644
--- a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
index da359bc296..da359bc296 100644
--- a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java