diff options
Diffstat (limited to '')
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java (renamed from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationAge.composite (renamed from branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationAge.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationUniqueId.composite (renamed from branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationUniqueId.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/conversationId.composite (renamed from branches/sca-java-1.5/itest/conversations/src/main/resources/conversationId.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/conversationLifetime.composite (renamed from branches/sca-java-1.5/itest/conversations/src/main/resources/conversationLifetime.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/conversational.composite (renamed from branches/sca-java-1.5/itest/conversations/src/main/resources/conversational.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java (renamed from branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java (renamed from branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java (renamed from branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java (renamed from branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java (renamed from branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java (renamed from branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java) | 0 |
47 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java index a3b83dfc14..a3b83dfc14 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java index 8e98b9cbd4..8e98b9cbd4 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java index e7583c339a..e7583c339a 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java index bc4a5fc571..bc4a5fc571 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java index 77d7f4c007..77d7f4c007 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java index e422938b27..e422938b27 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java index a6dbf56797..a6dbf56797 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java index 3f04e9f09e..3f04e9f09e 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java index 53dadc3dc7..53dadc3dc7 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java index 8cad88d2f4..8cad88d2f4 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java index 2532346349..2532346349 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java index 8f008fa711..8f008fa711 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java index 546382cfd1..546382cfd1 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java index f1a21cc18f..f1a21cc18f 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java index 74afbfb763..74afbfb763 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java index 5f97b16088..5f97b16088 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java index 3ce3e3ada7..3ce3e3ada7 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java index 95c9c7ae6e..95c9c7ae6e 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java index a5f37f7a52..a5f37f7a52 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java index c1e27641ef..c1e27641ef 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java index 900b8f743f..900b8f743f 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java index b21f956bd9..b21f956bd9 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java index 9deef312ac..9deef312ac 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java index cffa76186a..cffa76186a 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java index 1272c7ab7f..1272c7ab7f 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java index 847b038881..847b038881 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java index b77e4c0194..b77e4c0194 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java index 5b3906fc2c..5b3906fc2c 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java index 8fe7c5b6ba..8fe7c5b6ba 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java index 9a25f0f59a..9a25f0f59a 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java index efcbdff06f..efcbdff06f 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java index 8454b3846b..8454b3846b 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java index 07186c91e1..07186c91e1 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java index 344aa99dff..344aa99dff 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java index 8d79bb75e8..8d79bb75e8 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java index d1b769216b..d1b769216b 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java diff --git a/branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationAge.composite b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationAge.composite index abd1c35ced..abd1c35ced 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationAge.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationAge.composite diff --git a/branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationUniqueId.composite b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationUniqueId.composite index 831449a079..831449a079 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationUniqueId.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationUniqueId.composite diff --git a/branches/sca-java-1.5/itest/conversations/src/main/resources/conversationId.composite b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/conversationId.composite index e61eb08194..e61eb08194 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/resources/conversationId.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/conversationId.composite diff --git a/branches/sca-java-1.5/itest/conversations/src/main/resources/conversationLifetime.composite b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/conversationLifetime.composite index 3b79dc43d9..3b79dc43d9 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/resources/conversationLifetime.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/conversationLifetime.composite diff --git a/branches/sca-java-1.5/itest/conversations/src/main/resources/conversational.composite b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/conversational.composite index 4da3ce74d5..4da3ce74d5 100644 --- a/branches/sca-java-1.5/itest/conversations/src/main/resources/conversational.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/conversational.composite diff --git a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java index 3e750bdd1e..3e750bdd1e 100644 --- a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java diff --git a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java index 326a833a42..326a833a42 100644 --- a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java diff --git a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java index 431962221a..431962221a 100644 --- a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java diff --git a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java index cc31c77873..cc31c77873 100644 --- a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java diff --git a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java index 8480e04028..8480e04028 100644 --- a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java diff --git a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java index da359bc296..da359bc296 100644 --- a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java |