diff options
Diffstat (limited to '')
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/pom.xml (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback.composite (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/pom.xml (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/resources/callback-mixed.composite (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/resources/callback-mixed.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/pom.xml (renamed from branches/sca-java-1.5/vtest/java-api/conversation/id/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite (renamed from branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/pom.xml (renamed from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite (renamed from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/pom.xml (renamed from branches/sca-java-1.5/vtest/java-api/conversation/parameters/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite (renamed from branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java (renamed from branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/pom.xml (renamed from branches/sca-java-1.5/vtest/java-api/conversation/pom.xml) | 0 |
98 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/pom.xml index f98781c7db..f98781c7db 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/pom.xml diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java index e78736d4df..e78736d4df 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java index 0a90f9c99a..0a90f9c99a 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java index 0e61247294..0e61247294 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java index e317a6e7e0..e317a6e7e0 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java index 6446e006bd..6446e006bd 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java index 15672f9ee0..15672f9ee0 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java index 400c696d82..400c696d82 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java index 33421cb4d0..33421cb4d0 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java index 1b220abf69..1b220abf69 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java index 957957a2e4..957957a2e4 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java index 4ef741c1c1..4ef741c1c1 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java index bba4bf2611..bba4bf2611 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java index 4fb4fa53de..4fb4fa53de 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java index 83453397b2..83453397b2 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java index c165aa51da..c165aa51da 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java index c0440a2b1b..c0440a2b1b 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java index 8a237af0ad..8a237af0ad 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java index 9c185ddee3..9c185ddee3 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java index 2e79d135f4..2e79d135f4 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java index fb0d6b8a50..fb0d6b8a50 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java index 1ace5858b2..1ace5858b2 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java index 52d8fe5a7e..52d8fe5a7e 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java index eea769b2fb..eea769b2fb 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java index 1caa467348..1caa467348 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java index a7f471aa26..a7f471aa26 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java index 4aeeca6dc3..4aeeca6dc3 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java index 014f1edd33..014f1edd33 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java index 4e6dce6fb9..4e6dce6fb9 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java index 2f560fe87b..2f560fe87b 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java index 23e0d0e70b..23e0d0e70b 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java index 16b2932afc..16b2932afc 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java index 56b7006581..56b7006581 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java index 580cf5a612..580cf5a612 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java index 144492984a..144492984a 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java index ce7214dba1..ce7214dba1 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java index b61a15cbee..b61a15cbee 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java index cb9aee2b9f..cb9aee2b9f 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java index 1fe70344af..1fe70344af 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java index 033fa9d097..033fa9d097 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java index 5f7d8d9c94..5f7d8d9c94 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java index 47d5d53821..47d5d53821 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java index 18ce5edebe..18ce5edebe 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite index 802c9c30db..802c9c30db 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite index e66ea5d537..e66ea5d537 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite index 4d93d2279d..4d93d2279d 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite index cd8c589a59..cd8c589a59 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite index 6c69330ce5..6c69330ce5 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite index 72c08e8344..72c08e8344 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite index 144f7f3d00..144f7f3d00 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite index ace06b245c..ace06b245c 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback.composite index 4623f17ca2..4623f17ca2 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback.composite +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback.composite diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java index bd8f116c10..bd8f116c10 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/pom.xml index a582913c54..a582913c54 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/pom.xml diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java index e78736d4df..e78736d4df 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java index 0a90f9c99a..0a90f9c99a 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java index 0e61247294..0e61247294 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java index e317a6e7e0..e317a6e7e0 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java index 15672f9ee0..15672f9ee0 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java index 1ace5858b2..1ace5858b2 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java index 705e101a01..705e101a01 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java index c03b1aedc4..c03b1aedc4 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java index 8e068c8be4..8e068c8be4 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/resources/callback-mixed.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/resources/callback-mixed.composite index ff6e0b63b2..ff6e0b63b2 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/resources/callback-mixed.composite +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/resources/callback-mixed.composite diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java index 2bc5f6c910..2bc5f6c910 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/pom.xml index b9a738f731..b9a738f731 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/id/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/pom.xml diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java index f49952828c..f49952828c 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java index d4641c5ee6..d4641c5ee6 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java index 66a9b3b6c3..66a9b3b6c3 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java index ac40c56ee6..ac40c56ee6 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java index 517976ff73..517976ff73 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java index 752476ebf7..752476ebf7 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java index a01ceb7be4..a01ceb7be4 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite index 25e7154fca..25e7154fca 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java index d3cb107a61..d3cb107a61 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/pom.xml index d4b4927e94..d4b4927e94 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/pom.xml diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java index 8deef5df31..8deef5df31 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java index 5a20f4d960..5a20f4d960 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java index 6368b1157b..6368b1157b 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java index ab186ee7eb..ab186ee7eb 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java index dcc2e5d9c4..dcc2e5d9c4 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java index 06d40accd4..06d40accd4 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java index 56bfcabfc4..56bfcabfc4 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java index 0919734c7a..0919734c7a 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java index d9910d445c..d9910d445c 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java index 34c57e402e..34c57e402e 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite index 21ee8acac1..21ee8acac1 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java index 987ac3539f..987ac3539f 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/pom.xml index f4dafbbe80..f4dafbbe80 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/pom.xml diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java index bd19b504d9..bd19b504d9 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java index 8a5ef43a4b..8a5ef43a4b 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java index e9a6dc469d..e9a6dc469d 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java index 0ef2f219f7..0ef2f219f7 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java index ab0b05d163..ab0b05d163 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java index 27d0210fca..27d0210fca 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite index a8500dfb09..a8500dfb09 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java index 929fe06115..929fe06115 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/pom.xml index 5c8ee059cb..5c8ee059cb 100644 --- a/branches/sca-java-1.5/vtest/java-api/conversation/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/pom.xml |