summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.5/vtest/java-api/conversation
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-1.5/vtest/java-api/conversation')
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/pom.xml46
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java30
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java33
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java40
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java33
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java39
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java32
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java33
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java41
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java67
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java60
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java33
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java38
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java35
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java61
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java49
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java38
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java33
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java41
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java73
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java60
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java61
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java73
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java49
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java31
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java37
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java31
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java37
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java61
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java73
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java49
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java33
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java33
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java39
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java39
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java79
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java64
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java31
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java39
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java73
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java81
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java74
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java49
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite34
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite40
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite34
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite40
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite35
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite40
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite40
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite41
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback.composite40
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java358
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/pom.xml46
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java30
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java33
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java40
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java33
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java32
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java61
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java38
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java73
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java49
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/resources/callback-mixed.composite38
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java73
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/id/pom.xml46
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java39
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java41
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java37
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java54
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java69
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java65
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java56
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite40
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java118
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/lifetime/pom.xml46
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java56
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java35
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java47
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java53
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java34
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java38
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java197
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java64
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java40
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java78
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite45
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java216
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/parameters/pom.xml46
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java28
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java34
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java32
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java47
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java40
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java44
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite40
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java69
-rw-r--r--branches/sca-java-1.5/vtest/java-api/conversation/pom.xml64
98 files changed, 0 insertions, 5257 deletions
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/pom.xml b/branches/sca-java-1.5/vtest/java-api/conversation/callback/pom.xml
deleted file mode 100644
index f98781c7db..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>java-api-annotations</artifactId>
- <version>1.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>vtest-java-api-conversation-callback</artifactId>
- <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - Conversation - Callback</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-</project>
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
deleted file mode 100644
index e78736d4df..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback;
-
-/**
- * Simple Service
- */
-public interface AService {
-
- public void testCallback();
-
- public void testCallback2();
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
deleted file mode 100644
index 0a90f9c99a..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
- public void callBack(String someState);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
deleted file mode 100644
index 0e61247294..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AServiceCallback;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-@Callback(AServiceCallback.class)
-public interface BService {
-
- public void setState(String someState);
-
- public String getState();
-
- public void testCallBack(String string);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
deleted file mode 100644
index e317a6e7e0..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface BServiceCallback {
-
- public void callBack(String someState);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
deleted file mode 100644
index 6446e006bd..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-@Callback(BServiceCallback.class)
-public interface CService {
-
- public void setState(String someState);
-
- public String getState();
-
- public void testCallBack(String string);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
deleted file mode 100644
index 15672f9ee0..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback;
-
-public class Utilities {
-
- public static void delayQuarterSecond() {
- try {
- Thread.sleep(250);// millisecs
- } catch (InterruptedException ex) {
- throw new Error(ex);
- }
- }
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
deleted file mode 100644
index 400c696d82..0000000000
--- 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
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
- public void callBack(String someState);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
deleted file mode 100644
index 33421cb4d0..0000000000
--- 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
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-@Callback(AServiceCallback.class)
-public interface BService {
-
- public void setState(String someState);
-
- public String getState();
-
- public void testCallBack(String string);
-
- public void testCallBack2(String string);
-
-}
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/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
deleted file mode 100644
index 1b220abf69..0000000000
--- 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
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing.BService;
-import org.junit.Assert;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService, AServiceCallback {
-
- @Reference
- protected ServiceReference<BService> b;
-
- private String someState;
-
- public void callBack(String someState) {
- System.out.println("A-callback called with this state => " + someState);
- this.someState = someState;
- }
-
- public void testCallback() {
- b.getService().testCallBack("Some string");
- int count = 4;
- while (someState == null && count > 0) {
- Utilities.delayQuarterSecond();
- count--;
- }
- if (someState == null)
- Assert.fail("Callback not received by this instance");
- }
-
- public void testCallback2() {
- b.getService().testCallBack2("Some string");
- int count = 4;
- while (someState == null && count > 0) {
- Utilities.delayQuarterSecond();
- count--;
- }
- if (someState == null)
- Assert.fail("Callback not received by this instance");
- }
-}
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/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
deleted file mode 100644
index 957957a2e4..0000000000
--- 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
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing.BService;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService {
-
- String someState;
-
- @Callback
- protected CallableReference<AServiceCallback> callback;
-
- @Context
- protected ComponentContext componentContext;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void testCallBack(String someState) {
- callback.getService().callBack(someState);
- }
-
- public void testCallBack2(String someState) {
- AServiceCallback callback = componentContext.getRequestContext().getCallback();
- callback.callBack(someState);
- }
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
deleted file mode 100644
index 4ef741c1c1..0000000000
--- 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
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
- public void callBack(String someState);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
deleted file mode 100644
index bba4bf2611..0000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-@Callback(AServiceCallback.class)
-public interface BService {
-
- public void setState(String someState);
-
- public String getState();
-
- public void testCallBack(String string);
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
deleted file mode 100644
index 4fb4fa53de..0000000000
--- 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
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-public interface CustomCallback {
-
- public void someMethod();
-
- public void callBack(String someState);
-
-}
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/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
deleted file mode 100644
index 83453397b2..0000000000
--- 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
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.CustomCallback;
-import org.junit.Assert;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService {
-
- @Reference
- protected ServiceReference<BService> b;
-
- @Reference
- protected CustomCallback customCallback;
-
- protected static String someState;
-
- public void testCallback() {
- b.setCallback(customCallback);
- b.getService().testCallBack("Some string");
- int count = 4;
- while (someState == null && count > 0) {
- Utilities.delayQuarterSecond();
- count--;
- }
- if (someState == null)
- Assert.fail("Callback not received by this instance");
- }
-
- public void testCallback2() {
- Assert.fail("Should never get here");
-
- }
-
-}
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/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
deleted file mode 100644
index c165aa51da..0000000000
--- 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
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.BService;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService {
-
- String someState;
-
- @Callback
- protected AServiceCallback callback;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void testCallBack(String someState) {
- callback.callBack(someState);
- }
-
-}
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/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
deleted file mode 100644
index c0440a2b1b..0000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.CustomCallback;
-import org.osoa.sca.annotations.Scope;
-
-@Scope("CONVERSATION")
-public class CustomCallbackImpl implements CustomCallback, AServiceCallback {
-
- public void someMethod() {
- System.out.println("Custom-callback some method called");
- }
-
- public void callBack(String someState) {
- System.out.println("Custom-callback called with this state => " + someState);
- AServiceImpl.someState = someState;
- }
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
deleted file mode 100644
index 8a237af0ad..0000000000
--- 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
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
- public void callBack(String someState);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
deleted file mode 100644
index 9c185ddee3..0000000000
--- 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
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-@Callback(AServiceCallback.class)
-public interface BService {
-
- public void setState(String someState);
-
- public String getState();
-
- public void testCallBack(String string);
-
- public void testCallBack2(String string);
-
-}
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/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
deleted file mode 100644
index 2e79d135f4..0000000000
--- 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
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id.BService;
-import org.junit.Assert;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService, AServiceCallback {
-
- @Reference
- protected ServiceReference<BService> b;
-
- @Context
- protected RequestContext requestContext;
-
- private String someState;
-
- public void callBack(String someState) {
- System.out.println("A-callback called with this state => " + someState);
- Assert.assertNotNull(requestContext.getServiceReference().getCallbackID());
- this.someState = someState;
- }
-
- public void testCallback() {
- b.getService().testCallBack("Some string");
- int count = 4;
- while (someState == null && count > 0) {
- Utilities.delayQuarterSecond();
- count--;
- }
- if (someState == null)
- Assert.fail("Callback not received by this instance");
- }
-
- public void testCallback2() {
- b.getService().testCallBack2("Some string");
- int count = 4;
- while (someState == null && count > 0) {
- Utilities.delayQuarterSecond();
- count--;
- }
- if (someState == null)
- Assert.fail("Callback not received by this instance");
- }
-}
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/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
deleted file mode 100644
index fb0d6b8a50..0000000000
--- 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
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id.BService;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService {
-
- String someState;
-
- @Callback
- protected CallableReference<AServiceCallback> callback;
-
- @Context
- protected ComponentContext componentContext;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void testCallBack(String someState) {
- callback.getService().callBack(someState);
- }
-
- public void testCallBack2(String someState) {
- AServiceCallback callback = componentContext.getRequestContext().getCallback();
- callback.callBack(someState);
- }
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
deleted file mode 100644
index 1ace5858b2..0000000000
--- 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
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.junit.Assert;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService, AServiceCallback {
-
- @Reference
- protected ServiceReference<BService> b;
-
- private String someState;
-
- public void callBack(String someState) {
- System.out.println("A-callback called with this state => " + someState);
- this.someState = someState;
- }
-
- public void testCallback() {
- b.getService().testCallBack("Some string");
- int count = 4;
- while (someState == null && count > 0) {
- Utilities.delayQuarterSecond();
- count--;
- }
- if (someState == null)
- Assert.fail("Callback not received by this instance");
- }
-
- public void testCallback2() {
- Assert.fail("Should not be called");
- }
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
deleted file mode 100644
index 52d8fe5a7e..0000000000
--- 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
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.CService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.junit.Assert;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService, BServiceCallback {
-
- String someState;
-
- @Callback
- protected AServiceCallback callback;
-
- @Reference
- protected ServiceReference<CService> c;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void callBack(String someState) {
- System.out.println("B-callback called with this state => " + someState);
- this.someState = someState;
- }
-
- public void testCallBack(String someState) {
-
- c.getService().testCallBack(someState);
- int count = 4;
- while (this.someState == null && count > 0) {
- Utilities.delayQuarterSecond();
- count--;
- }
- if (this.someState == null)
- Assert.fail("Callback not received by this instance");
-
- callback.callBack(someState);
- }
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
deleted file mode 100644
index eea769b2fb..0000000000
--- 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
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.CService;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(CService.class)
-@Scope("CONVERSATION")
-public class CServiceImpl implements CService {
-
- String someState;
-
- @Callback
- protected BServiceCallback callback;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void testCallBack(String someState) {
- callback.callBack(someState);
- }
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
deleted file mode 100644
index 1caa467348..0000000000
--- 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
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local;
-
-import org.osoa.sca.annotations.Conversational;
-
-/**
- *
- */
-@Conversational
-public interface AServiceCallback {
-
- public void callBack(String someState);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
deleted file mode 100644
index a7f471aa26..0000000000
--- 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
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-
-/**
- * Simple Local Service
- */
-@Conversational
-@Callback(AServiceCallback.class)
-public interface BService {
-
- public void setState(String someState);
-
- public String getState();
-
- public void testCallBack(String string);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
deleted file mode 100644
index 4aeeca6dc3..0000000000
--- 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
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local;
-
-import org.osoa.sca.annotations.Conversational;
-
-/**
- * Simple Service
- */
-@Conversational
-public interface BServiceCallback {
-
- public void callBack(String someState);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
deleted file mode 100644
index 014f1edd33..0000000000
--- 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
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-
-/**
- * Simple Service
- */
-@Conversational
-@Callback(BServiceCallback.class)
-public interface CService {
-
- public void setState(String someState);
-
- public String getState();
-
- public void testCallBack(String string);
-
-}
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/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
deleted file mode 100644
index 4e6dce6fb9..0000000000
--- 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
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.BService;
-import org.junit.Assert;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService, AServiceCallback {
-
- @Reference
- protected ServiceReference<BService> b;
-
- private String someState;
-
- public void callBack(String someState) {
- System.out.println("A-callback called with this state => " + someState);
- this.someState = someState;
- }
-
- public void testCallback() {
- b.getService().testCallBack("Some local string");
- int count = 4;
- while (someState == null && count > 0) {
- Utilities.delayQuarterSecond();
- count--;
- }
- if (someState == null)
- Assert.fail("Callback not received by this instance");
- }
-
- public void testCallback2() {
- Assert.fail("Not implemented");
- }
-
-}
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/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
deleted file mode 100644
index 2f560fe87b..0000000000
--- 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
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.CService;
-import org.junit.Assert;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService, BServiceCallback {
-
- String someState;
-
- @Callback
- protected AServiceCallback callback;
-
- @Reference
- protected ServiceReference<CService> c;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void callBack(String someState) {
- System.out.println("B-callback called with this state => " + someState);
- this.someState = someState;
- }
-
- public void testCallBack(String someState) {
-
- c.getService().testCallBack(someState);
- int count = 4;
- while (this.someState == null && count > 0) {
- Utilities.delayQuarterSecond();
- count--;
- }
- if (this.someState == null)
- Assert.fail("Callback not received by this instance");
-
- callback.callBack(someState);
- }
-
-}
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/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
deleted file mode 100644
index 23e0d0e70b..0000000000
--- 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
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.CService;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(CService.class)
-@Scope("CONVERSATION")
-public class CServiceImpl implements CService {
-
- String someState;
-
- @Callback
- protected BServiceCallback callback;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void testCallBack(String someState) {
- callback.callBack(someState);
- }
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
deleted file mode 100644
index 16b2932afc..0000000000
--- 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
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
- public void callBack(String someState);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
deleted file mode 100644
index 56b7006581..0000000000
--- 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
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback2 {
-
- public void callBack2(String someState);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
deleted file mode 100644
index 580cf5a612..0000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-@Callback(AServiceCallback.class)
-public interface BService {
-
- public void setState(String someState);
-
- public String getState();
-
- public void testCallBack(String string);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
deleted file mode 100644
index 144492984a..0000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-@Callback(AServiceCallback2.class)
-public interface BService2 {
-
- public void setState(String someState);
-
- public String getState();
-
- public void testCallBack2(String string);
-
-}
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/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
deleted file mode 100644
index ce7214dba1..0000000000
--- 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
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.AServiceCallback2;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.BService2;
-import org.junit.Assert;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService, AServiceCallback , AServiceCallback2 {
-
- @Reference
- protected ServiceReference<BService> b;
-
- @Reference
- protected ServiceReference<BService2> b2;
-
-
- private String someState;
- private String someState2;
-
- public void callBack(String someState) {
- System.out.println("A-callback called with this state => " + someState);
- this.someState = someState;
- }
-
- public void callBack2(String someState) {
- System.out.println("A-callback2 called with this state => " + someState);
- this.someState2 = someState;
- }
-
- public void testCallback() {
- b.getService().testCallBack("Some string");
- int count = 4;
- while (someState == null && count > 0) {
- Utilities.delayQuarterSecond();
- count--;
- }
- if (someState == null)
- Assert.fail("Callback not received by this instance");
- }
-
- public void testCallback2() {
- b2.getService().testCallBack2("Some string");
- int count = 4;
- while (someState2 == null && count > 0) {
- Utilities.delayQuarterSecond();
- count--;
- }
- if (someState2 == null)
- Assert.fail("Callback not received by this instance");
- }
-}
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/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
deleted file mode 100644
index b61a15cbee..0000000000
--- 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
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.AServiceCallback2;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.BService2;
-import org.junit.Assert;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(interfaces= {BService.class,BService2.class})
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService, BService2 {
-
- String someState;
-
- @Callback
- protected AServiceCallback callback;
-
- @Callback
- protected AServiceCallback2 callback2;
-
- @Callback
- protected AServiceCallback2 callback3;
-
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void testCallBack(String someState) {
- callback.callBack(someState);
- }
-
- public void testCallBack2(String someState) {
- Assert.assertNotNull(callback3); //Spec lines 670,671
- callback2.callBack2(someState);
- }
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
deleted file mode 100644
index cb9aee2b9f..0000000000
--- 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
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-public interface BServiceCallback {
-
- public void callBack(String someState);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
deleted file mode 100644
index 1fe70344af..0000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-@Callback(BServiceCallback.class)
-public interface CService {
-
- public void setState(String someState);
-
- public String getState();
-
- public void testCallBack(String string);
-
-}
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/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
deleted file mode 100644
index 033fa9d097..0000000000
--- 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
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.CService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.junit.Assert;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService, BServiceCallback {
-
- String someState;
-
- @Callback
- protected AServiceCallback callback;
-
- @Reference
- protected ServiceReference<CService> c;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void callBack(String someState) {
- System.out.println("B-callback called with this state => " + someState);
- this.someState = someState;
- }
-
- public void testCallBack(String someState) {
-
- c.getService().testCallBack(someState);
- int count = 4;
- while (this.someState == null && count > 0) {
- Utilities.delayQuarterSecond();
- count--;
- }
- if (this.someState != null)
- Assert.fail("Callback should NOT have been received by this instance");
-
- callback.callBack(someState);
- }
-
-}
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/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
deleted file mode 100644
index 5f7d8d9c94..0000000000
--- 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
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.CService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.junit.Assert;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl2 implements BService, BServiceCallback {
-
- String someState;
-
- @Context
- protected RequestContext rc;
-
- @Callback
- protected AServiceCallback callback;
-
- @Reference
- protected ServiceReference<CService> c;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void callBack(String someState) {
- System.out.println("B-callback called with this state => " + someState);
- this.someState = someState;
- Assert.assertSame("1234", rc.getServiceReference().getCallbackID());
- }
-
- public void testCallBack(String someState) {
-
- c.setCallbackID("1234");
-
- c.getService().testCallBack(someState);
- int count = 4;
- while (this.someState == null && count > 0) {
- Utilities.delayQuarterSecond();
- count--;
- }
- if (this.someState != null)
- Assert.fail("Callback should NOT have been received by this instance");
-
- callback.callBack(someState);
- }
-
-}
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/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
deleted file mode 100644
index 47d5d53821..0000000000
--- 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
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.CService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.junit.Assert;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl3 implements BService, BServiceCallback {
-
- String someState;
-
- @Callback
- protected AServiceCallback callback;
-
- @Reference
- protected ServiceReference<CService> c;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void callBack(String someState) {
- System.out.println("B-callback called with this state => " + someState);
- this.someState = someState;
- Assert.assertSame(null, callback);
- }
-
- public void testCallBack(String someState) {
-
- c.getService().testCallBack(someState);
- int count = 4;
- while (this.someState == null && count > 0) {
- Utilities.delayQuarterSecond();
- count--;
- }
- if (this.someState != null)
- Assert.fail("Callback should NOT have been received by this instance");
-
- callback.callBack(someState);
- }
-
-}
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/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
deleted file mode 100644
index 18ce5edebe..0000000000
--- 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
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.CService;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(CService.class)
-@Scope("CONVERSATION")
-public class CServiceImpl implements CService {
-
- String someState;
-
- @Callback
- protected BServiceCallback callback;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void testCallBack(String someState) {
- callback.callBack(someState);
- }
-
-}
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite b/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
deleted file mode 100644
index 802c9c30db..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://java-api-tests" name="Conversation-callback-multi">
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing.impl.AServiceImpl" />
- <reference name="b" target="BComponent" />
- </component>
-
- <component name="BComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing.impl.BServiceImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite b/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
deleted file mode 100644
index e66ea5d537..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://java-api-tests" name="Conversation-callback-custom">
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.impl.AServiceImpl" />
- <reference name="b" target="BComponent" />
- <reference name="customCallback" target="CComponent/CustomCallback" />
- </component>
-
- <component name="BComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.impl.BServiceImpl" />
- </component>
-
- <component name="CComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.impl.CustomCallbackImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite b/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
deleted file mode 100644
index 4d93d2279d..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://java-api-tests" name="Conversation-callback-id">
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id.impl.AServiceImpl" />
- <reference name="b" target="BComponent" />
- </component>
-
- <component name="BComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id.impl.BServiceImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite b/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
deleted file mode 100644
index cd8c589a59..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://java-api-tests" name="Conversation-Callback-local">
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.impl.AServiceImpl" />
- <reference name="b" target="BComponent" />
- </component>
-
- <component name="BComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.impl.BServiceImpl" />
- <reference name="c" target="CComponent" />
- </component>
-
- <component name="CComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.impl.CServiceImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite b/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
deleted file mode 100644
index 6c69330ce5..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://java-api-tests" name="Conversation-callback-multi">
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.impl.AServiceImpl" />
- <reference name="b" target="BComponent/BService" />
- <reference name="b2" target="BComponent/BService2" />
- </component>
-
- <component name="BComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.impl.BServiceImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite b/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
deleted file mode 100644
index 72c08e8344..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://java-api-tests" name="Conversation-callback-stateless">
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.AServiceImpl" />
- <reference name="b" target="BComponent" />
- </component>
-
- <component name="BComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.BServiceImpl3" />
- <reference name="c" target="CComponent" />
- </component>
-
- <component name="CComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.CServiceImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite b/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
deleted file mode 100644
index 144f7f3d00..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://java-api-tests" name="Conversation-callback-stateless">
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.AServiceImpl" />
- <reference name="b" target="BComponent" />
- </component>
-
- <component name="BComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.BServiceImpl2" />
- <reference name="c" target="CComponent" />
- </component>
-
- <component name="CComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.CServiceImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite b/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
deleted file mode 100644
index ace06b245c..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://java-api-tests" name="Conversation-callback-stateless">
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.AServiceImpl" />
- <reference name="b" target="BComponent" />
- </component>
-
- <component name="BComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.BServiceImpl" />
- <reference name="c" target="CComponent" />
- </component>
-
- <component name="CComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.CServiceImpl" />
- </component>
-
-
-</composite>
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback.composite b/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback.composite
deleted file mode 100644
index 4623f17ca2..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback.composite
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://java-api-tests" name="Conversation-callback">
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.AServiceImpl" />
- <reference name="b" target="BComponent" />
- </component>
-
- <component name="BComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.BServiceImpl" />
- <reference name="c" target="CComponent" />
- </component>
-
- <component name="CComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.CServiceImpl" />
- </component>
-
-</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/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
deleted file mode 100644
index bd8f116c10..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- *
- */
-public class CallbackTestCase {
-
- protected static AService aService = null;
-
- @Before
- public void init() throws Exception {
- try {
- System.out.println("Setting up");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- @After
- public void destroy() throws Exception {
-
- System.out.println("Cleaning up");
- ServiceFinder.cleanup();
- }
-
- /**
- * Lines 529-610
- * <p>
- * A callback service is a service that is used for asynchronous
- * communication from a service provider back to its client in contrast to
- * the communication through return values from synchronous operations.
- * Callbacks are used by bidirectional services, which are services that
- * have two interfaces: • an interface for the provided service • a callback
- * interface that must be provided by the client
- * <p>
- * Callbacks may be used for both remotable and local services. Either both
- * interfaces of a bidirectional service must be remotable, or both must be
- * local. It is illegal to mix the two. There are two basic forms of
- * callbacks: stateless callbacks and stateful callbacks. A callback
- * interface is declared by using the "@Callback" annotation on a remotable
- * service interface, which takes the Java Class object of the interface as
- * a parameter. The annotation may also be applied to a method or to a field
- * of an implementation, which is used in order to have a callback injected,
- * as explained in the next section.
- * <p>
- * 1.6.7.1. Stateful Callbacks A stateful callback represents a specific
- * implementation instance of the component that is the client of the
- * service. The interface of a stateful callback should be marked as
- * conversational. The following example interfaces define an interaction
- * over stateful callback.
- * <p>
- * An implementation of the service in this example could use the
- * "@Callback" annotation to request that a stateful callback be injected.
- * The following is a fragment of an implementation of the example service.
- * In this example, the request is passed on to some other component, so
- * that the example service acts essentially as an intermediary. Because the
- * service is conversation scoped, the callback will still be available when
- * the backend service sends back its asynchronous response.
- * <p>
- * This fragment must come from an implementation that offers two services,
- * one that it offers to it clients (MyService) and one that is used for
- * receiving callbacks from the back end (MyServiceCallback). The client of
- * this service would also implement the methods defined in
- * MyServiceCallback.
- * <p>
- * Stateful callbacks support some of the same use cases as are supported by
- * the ability to pass service references as parameters. The primary
- * difference is that stateful callbacks do not require any additional
- * parameters be passed with service operations. This can be a great
- * convenience. If the service has many operations and any of those
- * operations could be the first operation of the conversation, it would be
- * unwieldy to have to take a callback parameter as part of every operation,
- * just in case it is the first operation of the conversation. It is also
- * more natural than requiring the application developers to invoke an
- * explicit operation whose only purpose is to pass the callback object that
- * should be used.
- * <p>
- * This tests the *remote* bidirectional interfaces option
- */
- @Test
- public void statefulCallback() throws Exception {
- System.out.println("Setting up for callback tests");
- ServiceFinder.init("callback.composite");
- aService = ServiceFinder.getService(AService.class, "AComponent");
- aService.testCallback();
- }
-
- /**
- * Lines 529-610
- * <p>
- * A callback service is a service that is used for asynchronous
- * communication from a service provider back to its client in contrast to
- * the communication through return values from synchronous operations.
- * Callbacks are used by bidirectional services, which are services that
- * have two interfaces: • an interface for the provided service • a callback
- * interface that must be provided by the client
- * <p>
- * Callbacks may be used for both remotable and local services. Either both
- * interfaces of a bidirectional service must be remotable, or both must be
- * local. It is illegal to mix the two. There are two basic forms of
- * callbacks: stateless callbacks and stateful callbacks. A callback
- * interface is declared by using the "@Callback" annotation on a remotable
- * service interface, which takes the Java Class object of the interface as
- * a parameter. The annotation may also be applied to a method or to a field
- * of an implementation, which is used in order to have a callback injected,
- * as explained in the next section.
- * <p>
- * 1.6.7.1. Stateful Callbacks A stateful callback represents a specific
- * implementation instance of the component that is the client of the
- * service. The interface of a stateful callback should be marked as
- * conversational. The following example interfaces define an interaction
- * over stateful callback.
- * <p>
- * An implementation of the service in this example could use the
- * "@Callback" annotation to request that a stateful callback be injected.
- * The following is a fragment of an implementation of the example service.
- * In this example, the request is passed on to some other component, so
- * that the example service acts essentially as an intermediary. Because the
- * service is conversation scoped, the callback will still be available when
- * the backend service sends back its asynchronous response.
- * <p>
- * This fragment must come from an implementation that offers two services,
- * one that it offers to it clients (MyService) and one that is used for
- * receiving callbacks from the back end (MyServiceCallback). The client of
- * this service would also implement the methods defined in
- * MyServiceCallback.
- * <p>
- * Stateful callbacks support some of the same use cases as are supported by
- * the ability to pass service references as parameters. The primary
- * difference is that stateful callbacks do not require any additional
- * parameters be passed with service operations. This can be a great
- * convenience. If the service has many operations and any of those
- * operations could be the first operation of the conversation, it would be
- * unwieldy to have to take a callback parameter as part of every operation,
- * just in case it is the first operation of the conversation. It is also
- * more natural than requiring the application developers to invoke an
- * explicit operation whose only purpose is to pass the callback object that
- * should be used.
- * <p>
- * This tests the *local* bidirectional interfaces option
- */
- @Test
- public void localstatefulCallback() throws Exception {
- System.out.println("Setting up for local callback tests");
- ServiceFinder.init("callback-local.composite");
- aService = ServiceFinder.getService(AService.class, "AComponent");
- aService.testCallback();
- }
-
- /**
- * Lines 613-615
- * <p>
- * A stateless callback interface is a callback whose interface is not
- * marked as conversational. Unlike stateless services, the client of that
- * uses stateless callbacks will not have callback methods routed to an
- * instance of the client that contains any state that is relevant to the
- * conversation.
- * <p>
- * This test is identical in structure to the stateful test except that
- * BServiceCallback is not conversational and we test that the callback is
- * NOT routed to the same instance.
- */
- @Test
- public void statelessCallback() throws Exception {
- System.out.println("Setting up for stateless callback tests");
- ServiceFinder.init("callback-stateless.composite");
- aService = ServiceFinder.getService(AService.class, "AComponent");
- aService.testCallback();
- }
-
- /**
- * Lines 616-621
- * <p>
- * The only information that the client has to work with (other than the
- * parameters of the callback method) is a callback ID object that is passed
- * with requests to the service and is guaranteed to be returned with any
- * callback.
- * <p>
- * The following is a repeat of the client code fragment above, but with the
- * assumption that in this case the MyServiceCallback is stateless. The
- * client in this case needs to set the callback ID before invoking the
- * service and then needs to get the callback ID when the response is
- * received.
- * <p>
- * Lines 747-755
- * <p>
- * The identity that is used to identify a callback request is, by default,
- * generated by the system. However, it is possible to provide an
- * application specified identity that should be used to identify the
- * callback by calling the ServiceReference.setCallbackID() method. This can
- * be used even either stateful or stateless callbacks. The identity will be
- * sent to the service provider, and the binding must guarantee that the
- * service provider will send the ID back when any callback method is
- * invoked. The callback identity has the same restrictions as the
- * conversation ID. It should either be a string or an object that can be
- * serialized into XML. Bindings determine the particular mechanisms to use
- * for transmission of the identity and these may lead to further
- * restrictions when using a given binding.
- * <p>
- * TODO - Need to add explicit test back to stateful for 747-755
- */
- @Test
- public void statelessCallback2() throws Exception {
- System.out.println("Setting up for stateless callback id tests");
- ServiceFinder.init("callback-stateless-callbackid.composite");
- aService = ServiceFinder.getService(AService.class, "AComponent");
- aService.testCallback();
-
- }
-
- /**
- * Lines 650-654
- * <p>
- * The difference for stateless services is that the callback field would
- * not be available if the component is servicing a request for anything
- * other than the original client. So, the technique used in the previous
- * section, where there was a response from the backend Service which was
- * forwarded as a callback from MyService would not work because the
- * callback field would be null when the message from the backend system was
- * received.
- * <p>
- */
- @Test
- public void statelessCallback3() throws Exception {
- System.out.println("Setting up for stateless callback ref null tests");
- ServiceFinder.init("callback-stateless-callbackfieldnull.composite");
- aService = ServiceFinder.getService(AService.class, "AComponent");
- aService.testCallback();
-
- }
-
- /**
- * Lines 658-669
- * <p>
- * Since it is possible for a single implementation class to implement
- * multiple services, it is also possible for callbacks to be defined for
- * each of the services that it implements. The service implementation can
- * include an injected field for each of its callbacks. The runtime injects
- * the callback onto the appropriate field based on the type of the
- * callback. The following shows the declaration of two fields, each of
- * which corresponds to a particular service offered by the implementation.
- * <p>
- * Lines 670,671
- * <p>
- * If a single callback has a type that is compatible with multiple declared
- * callback fields, then all of them will be set.
- */
- @Test
- public void statefulMultiBidirectional() throws Exception {
- System.out.println("Setting up for multi-bidirectional interfaces tests");
- ServiceFinder.init("callback-multi.composite");
- aService = ServiceFinder.getService(AService.class, "AComponent");
- aService.testCallback();
- aService.testCallback2(); // Includes test for 670,671
-
- }
-
- /**
- * Lines 675-706
- * <p>
- * In addition to injecting a reference to a callback service, it is also
- * possible to obtain a reference to a Callback instance by annotating a
- * field or method with the "@Callback" annotation. A reference implementing
- * the callback service interface may be obtained using
- * CallableReference.getService(). The following fragments come from a
- * service implementation that uses the callback API:
- * <p>
- * Alternatively a callback may be retrieved programmatically using the
- * RequestContext API. The snippet below show how to retrieve a callback in
- * a method programmatically:
- * <p>
- * Lines 695, 696
- * <p>
- * Alternatively a callback may be retrieved programmatically using the
- * RequestContext API. The snippet below show how to retrieve a callback in
- * a method programmatically:
- */
- @Test
- public void accessingCallbacks() throws Exception {
- System.out.println("Setting up for callback accessing tests");
- ServiceFinder.init("callback-accessing.composite");
- aService = ServiceFinder.getService(AService.class, "AComponent");
- aService.testCallback();
- aService.testCallback2(); // Lines 695-696
-
- }
-
- /**
- * Lines 708-724
- * <p>
- * On the client side, the service that implements the callback can access
- * the callback ID (i.e. reference parameters) that was returned with the
- * callback operation also by accessing the request context, as follows:
- * <p>
- * On the client side, the object returned by the getServiceReference()
- * method represents the service reference that was used to send the
- * original request. The object returned by getCallbackID() represents the
- * identity associated with the callback, which may be a single String or
- * may be an object (as described below in “Customizing the Callback
- * Identity”).
- */
- @Test
- public void callbackId() throws Exception {
- System.out.println("Setting up for callback id tests");
- ServiceFinder.init("callback-id.composite");
- aService = ServiceFinder.getService(AService.class, "AComponent");
- aService.testCallback();
-
- }
-
- /**
- * Lines 728-732
- * <p>
- * By default, the client component of a service is assumed to be the
- * callback service for the bidirectional service. However, it is possible
- * to change the callback by using the ServiceReference.setCallback()
- * method. The object passed as the callback should implement the interface
- * defined for the callback, including any additional SCA semantics on that
- * interface such as its scope and whether or not it is remotable.
- * <p>
- * TODO - Need to complete testing of 1.6.7.5 after resolution of t-2312
- */
- @Test
- public void customCallback() throws Exception {
- System.out.println("Setting up for custom callback tests; create domain instance");
- ServiceFinder.init("callback-custom.composite");
- System.out.println("Setting up for custom callback tests; get AService handle");
- aService = ServiceFinder.getService(AService.class, "AComponent");
- aService.testCallback();
-
- }
-}
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/pom.xml b/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/pom.xml
deleted file mode 100644
index a582913c54..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>java-api-annotations</artifactId>
- <version>1.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>vtest-java-api-conversation-callback-mixed</artifactId>
- <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - Conversation - Callback - Mixed</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-</project>
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/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
deleted file mode 100644
index e78736d4df..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback;
-
-/**
- * Simple Service
- */
-public interface AService {
-
- public void testCallback();
-
- public void testCallback2();
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
deleted file mode 100644
index 0a90f9c99a..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
- public void callBack(String someState);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
deleted file mode 100644
index 0e61247294..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AServiceCallback;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-@Callback(AServiceCallback.class)
-public interface BService {
-
- public void setState(String someState);
-
- public String getState();
-
- public void testCallBack(String string);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
deleted file mode 100644
index e317a6e7e0..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface BServiceCallback {
-
- public void callBack(String someState);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
deleted file mode 100644
index 15672f9ee0..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback;
-
-public class Utilities {
-
- public static void delayQuarterSecond() {
- try {
- Thread.sleep(250);// millisecs
- } catch (InterruptedException ex) {
- throw new Error(ex);
- }
- }
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
deleted file mode 100644
index 1ace5858b2..0000000000
--- 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
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.junit.Assert;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService, AServiceCallback {
-
- @Reference
- protected ServiceReference<BService> b;
-
- private String someState;
-
- public void callBack(String someState) {
- System.out.println("A-callback called with this state => " + someState);
- this.someState = someState;
- }
-
- public void testCallback() {
- b.getService().testCallBack("Some string");
- int count = 4;
- while (someState == null && count > 0) {
- Utilities.delayQuarterSecond();
- count--;
- }
- if (someState == null)
- Assert.fail("Callback not received by this instance");
- }
-
- public void testCallback2() {
- Assert.fail("Should not be called");
- }
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
deleted file mode 100644
index 705e101a01..0000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.mixed;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BServiceCallback;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-
-/**
- * Simple Service
- */
-@Conversational
-@Callback(BServiceCallback.class)
-public interface CService {
-
- public void setState(String someState);
-
- public String getState();
-
- public void testCallBack(String string);
-
-}
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/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
deleted file mode 100644
index c03b1aedc4..0000000000
--- 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
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.mixed.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.mixed.CService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.Utilities;
-import org.junit.Assert;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService, BServiceCallback {
-
- String someState;
-
- @Callback
- protected AServiceCallback callback;
-
- @Reference
- protected ServiceReference<CService> c;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void callBack(String someState) {
- System.out.println("B-callback called with this state => " + someState);
- this.someState = someState;
- }
-
- public void testCallBack(String someState) {
-
- c.getService().testCallBack(someState);
- int count = 4;
- while (this.someState == null && count > 0) {
- Utilities.delayQuarterSecond();
- count--;
- }
- if (this.someState == null)
- Assert.fail("Callback not received by this instance");
-
- callback.callBack(someState);
- }
-
-}
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/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
deleted file mode 100644
index 8e068c8be4..0000000000
--- 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
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback.mixed.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.mixed.CService;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(CService.class)
-@Scope("CONVERSATION")
-public class CServiceImpl implements CService {
-
- String someState;
-
- @Callback
- protected BServiceCallback callback;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void testCallBack(String someState) {
- callback.callBack(someState);
- }
-
-}
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/resources/callback-mixed.composite b/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/resources/callback-mixed.composite
deleted file mode 100644
index ff6e0b63b2..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/resources/callback-mixed.composite
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://java-api-tests" name="Conversation-callback-mixed">
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.AServiceImpl" />
- <reference name="b" target="BComponent" />
- </component>
-
- <component name="BComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.mixed.impl.BServiceImpl" />
- <reference name="c" target="CComponent" />
- </component>
-
- <component name="CComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.mixed.impl.CServiceImpl" />
- </component>
-</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/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
deleted file mode 100644
index 2bc5f6c910..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.callback;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- *
- */
-public class CallbackTestCase {
-
- protected static AService aService = null;
-
- @Before
- public void init() throws Exception {
- try {
- System.out.println("Setting up");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- @After
- public void destroy() throws Exception {
-
- System.out.println("Cleaning up");
- ServiceFinder.cleanup();
- }
-
- /**
- * Lines 534, 535
- * <p>
- * Callbacks may be used for both remotable and local services. Either both
- * interfaces of a bidirectional service must be remotable, or both must be
- * local. It is illegal to mix the two.
- * <p>
- * In this test configuration BServiceCallback is remotable and CService is
- * not
- */
- @Test(expected = ServiceRuntimeException.class)
- public void statefulMixedCallback() throws Exception {
- System.out.println("Setting up for mixed local/remote callback tests");
- ServiceFinder.init("callback-mixed.composite");
-
- // test an error was detected
-
- //aService = ServiceFinder.getService(AService.class, "AComponent");
- //aService.testCallback();
- }
-
-}
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/pom.xml b/branches/sca-java-1.5/vtest/java-api/conversation/id/pom.xml
deleted file mode 100644
index b9a738f731..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/id/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>java-api-annotations</artifactId>
- <version>1.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>vtest-java-api-conversation-id</artifactId>
- <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - Conversation - ID</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-</project>
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/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
deleted file mode 100644
index f49952828c..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.id;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-public interface AService {
-
- public void testAnnotation();
-
- public void testAnnotation2();
-
- public void testAnnotation3();
-
- public void testAnnotation4();
-
- public void testAnnotation5();
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
deleted file mode 100644
index d4641c5ee6..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.id;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Local Service
- */
-@Remotable
-@Conversational
-public interface BService {
-
- public void setState(String someState);
-
- public String getState();
-
- public void testAnnotation();
-
- public void testAnnotation2();
-
- public void testAnnotation3();
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
deleted file mode 100644
index 66a9b3b6c3..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.id;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Local Service
- */
-@Remotable
-@Conversational
-public interface CService {
-
- public void setState(String someState);
-
- public String getState();
-
- public void testAnnotation();
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
deleted file mode 100644
index ac40c56ee6..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.id;
-
-
-public class CustomConversationId {
-
- int id;
- String name;
-
- public CustomConversationId(int id, String name) {
- super();
- this.id = id;
- this.name = name;
- }
-
- public String getName() {
- return name;
- }
-
- public int getNumber() {
- return id;
- }
-
- public void setName(String someName) {
- name = someName;
- }
-
- public void setNumber(int someInt) {
- id = someInt;
- }
-
- public String toString() {
- return "id->" + id + " name->" + name;
- }
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
deleted file mode 100644
index 517976ff73..0000000000
--- 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
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.id.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.id.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.id.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.id.CService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.id.CustomConversationId;
-import org.junit.Assert;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService {
-
- @Reference
- protected ServiceReference<BService> b;
-
- @Reference
- protected ServiceReference<CService> c;
-
- public void testAnnotation() {
- b.getService().testAnnotation();
- }
-
- public void testAnnotation2() {
- b.getService().testAnnotation2();
- }
-
- public void testAnnotation3() {
- b.getService().testAnnotation3();
- }
-
- public void testAnnotation4() {
- CustomConversationId id = new CustomConversationId (1, "One");
- c.setConversationID(id);
- c.getService().testAnnotation();
- }
-
- public void testAnnotation5() {
- b.getService().getState();
- Assert.assertNotNull(b.getConversation().getConversationID());
-// Assert.assertNotNull(b.getConversationID());
-
- CustomConversationId id = new CustomConversationId (1, "One");
- c.setConversationID(id);
- Assert.assertSame(id, c.getConversationID());
- }
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
deleted file mode 100644
index 752476ebf7..0000000000
--- 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
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.id.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.id.BService;
-import org.junit.Assert;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge = "1 seconds")
-public class BServiceImpl implements BService {
-
- String someState;
-
- @ConversationID
- protected String conversationID;
-
- @ConversationID
- protected Object conversationID2;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void testAnnotation() {
- Assert.assertNotNull(conversationID);
- System.out.println(conversationID);
- }
-
- public void testAnnotation2() {
- Assert.assertNotNull(conversationID2);
- System.out.println(conversationID);
- }
-
- public void testAnnotation3() {
- Assert.assertTrue(conversationID2 instanceof String);
- System.out.println(conversationID);
- }
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
deleted file mode 100644
index a01ceb7be4..0000000000
--- 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
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.id.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.id.CService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.id.CustomConversationId;
-import org.junit.Assert;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(CService.class)
-@Scope("CONVERSATION")
-public class CServiceImpl implements CService {
-
- String someState;
-
- @ConversationID
- protected Object conversationID;
-
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void testAnnotation() {
- Assert.assertNotNull(conversationID);
- Assert.assertTrue(conversationID instanceof CustomConversationId);
-
- Assert.assertSame(1, ((CustomConversationId)conversationID).getNumber());
- Assert.assertSame("One", ((CustomConversationId)conversationID).getName());
- System.out.println(conversationID);
- }
-
-}
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite b/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
deleted file mode 100644
index 25e7154fca..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://java-api-tests" name="Converstion-ID">
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.id.impl.AServiceImpl" />
- <reference name="b" target="BComponent" />
- <reference name="c" target="CComponent" />
- </component>
-
- <component name="BComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.id.impl.BServiceImpl" />
- </component>
-
- <component name="CComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.id.impl.CServiceImpl" />
- </component>
-
-</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/branches/sca-java-1.5/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
deleted file mode 100644
index d3cb107a61..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.id;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- *
- */
-public class ConversationIDTestCase {
-
- protected static String compositeName = "conversation-id.composite";
- protected static AService aService = null;
-
- @BeforeClass
- public static void init() throws Exception {
- try {
- System.out.println("Setting up");
- ServiceFinder.init(compositeName);
- aService = ServiceFinder.getService(AService.class, "AComponent");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- @AfterClass
- public static void destroy() throws Exception {
-
- System.out.println("Cleaning up");
- ServiceFinder.cleanup();
-
- }
-
- /**
- * Lines 504, 505
- * <p>
- * If a protected or public field or setter method is annotated with
- * "@ConversationID", then the conversation ID for the conversation is
- * injected onto the field
- */
- @Test
- public void idAnnotation() throws Exception {
- aService.testAnnotation();
- }
-
- /**
- * Lines 505
- * <p>
- * The type of the field is not necessarily String
- */
- @Test
- public void idAnnotation2() throws Exception {
- aService.testAnnotation2();
- }
-
- /**
- * Lines 505, 506
- * <p>
- * System generated conversation IDs are always strings
- */
- @Test
- public void idAnnotation3() throws Exception {
- aService.testAnnotation3();
- }
-
- /**
- * Lines 506, 507
- * <p>
- * ... but application generated conversation IDs may be other complex
- * types.
- * <p>
- * Lines 513, 514
- * <p>
- * ... To do this, the client would not use reference injection, but would
- * use the of ServiceReference.setConversationID() API.
- */
- @Test
- public void idAnnotation4() throws Exception {
- aService.testAnnotation4();
- }
-
- /**
- * Lines 522, 523
- * <p>
- * Whether the conversation ID is chosen by the client or is generated by
- * the system, the client may access the conversation ID by calling
- * ServiceReference.getConversationID().
- * <p>
- * This test is following updates to this section of the specification per
- * the OASIS TC under issue JAVA-31. The updated text reads: "...by calling
- * getConversationID() on the current conversation object".
- */
- @Test
- public void idAnnotation5() throws Exception {
- aService.testAnnotation5();
- }
-
-}
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/pom.xml b/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/pom.xml
deleted file mode 100644
index d4b4927e94..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>java-api-annotations</artifactId>
- <version>1.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>vtest-java-api-conversation-lifetime</artifactId>
- <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - Conversation - Lifetime</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-</project>
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/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
deleted file mode 100644
index 8deef5df31..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-public interface AService {
-
- public void testConversationStarted();
-
- public void testConversationStarted2();
-
- public void testConversationContinue();
-
- public void testConversationContinue2();
-
- public void testConversationContinue3();
-
- public void testConversationEnd();
-
- public void testConversationEnd2();
-
- public void testConversationEnd3();
-
- public void testConversationEnd4();
-
- public void testConversationEnd5();
-
- public void testConversationEnd6();
-
- public void testConversationEnd7();
-
- public void testConversationEnd8();
-
- public void testConversationEnd9();
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
deleted file mode 100644
index 5a20f4d960..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
- @EndsConversation
- public void endConversation();
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
deleted file mode 100644
index 6368b1157b..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Local Service
- */
-@Remotable
-@Conversational
-@Callback(AServiceCallback.class)
-public interface BService {
-
- public void setState(String someState);
-
- public String getState();
-
- @EndsConversation
- public void endConversation();
-
- public void endConversationViaCallback();
-
- public void throwNonBusinessException();
-
- public void throwBusinessException() throws BServiceBusinessException;
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
deleted file mode 100644
index ab186ee7eb..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime;
-
-
-/**
- * Denotes an error starting the runtime
- *
- * @version $Rev$ $Date$
- */
-public class BServiceBusinessException extends Exception {
-
- static final long serialVersionUID = 2096658015909178325L;
-
- private String message;
-
- public BServiceBusinessException() {
- }
-
- public BServiceBusinessException(String message) {
- super(message);
- setMessage(message);
- }
-
- public BServiceBusinessException(Throwable cause) {
- super(cause);
- setMessage(cause.getMessage());
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
deleted file mode 100644
index dcc2e5d9c4..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Local Service
- */
-@Remotable
-@Conversational
-public interface CService {
-
- public void setState(String someState);
- public String getState();
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
deleted file mode 100644
index 06d40accd4..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime;
-
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Local Service
- */
-@Remotable
-@Conversational
-public interface DService {
-
- public void setState(String someState);
- public String getState();
-
- public void continueConversation(ServiceReference<BService> b, Object convId);
- public void continueConversation2(String filename, Object id, String serializedState);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
deleted file mode 100644
index 56bfcabfc4..0000000000
--- 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
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.impl;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.BServiceBusinessException;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.CService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.DService;
-import org.junit.Assert;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ConversationEndedException;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService, AServiceCallback {
-
- @Context
- public ComponentContext context;
-
- @Reference
- protected ServiceReference<BService> b;
-
- @Reference
- protected DService d;
-
- public void testConversationStarted() {
- b.getService().setState("Some state");
- Assert.assertNotNull(b.getConversation().getConversationID());
- }
-
- public void testConversationStarted2() {
- ServiceReference<BService> ref = context.getServiceReference(BService.class, "b");
- ref.getService().setState("Some state");
- Assert.assertNotNull(ref.getConversation().getConversationID());
- }
-
- public void testConversationContinue() {
-
- b.getService().setState("Some state");
- Object id = b.getConversation().getConversationID();
- b.getService().setState("Some more state");
- Assert.assertEquals(id, b.getConversation().getConversationID());
- }
-
- public void testConversationContinue2() {
-
- b.getService().setState("Some state");
- d.continueConversation(b, b.getConversation().getConversationID());
-
- }
-
- public void testConversationContinue3() {
-
- String serializedState = "Serialized State";
-
- String filename = "target/Serialized-Reference.txt";
- b.getService().setState(serializedState);
- Object id = b.getConversation().getConversationID();
- writeReference(b, filename);
- d.continueConversation2(filename, id, serializedState);
-
- }
-
- // Utilities
-
- private void delayForSeconds(int numSeconds) {
- try {
- Thread.sleep(numSeconds * 1000);// millisecs
- } catch (InterruptedException ex) {
- throw new Error(ex);
- }
- }
-
- private void writeReference(ServiceReference<BService> ref, String filename) {
-
- FileOutputStream fos = null;
- ObjectOutputStream out = null;
- try {
- fos = new FileOutputStream(filename);
- out = new ObjectOutputStream(fos);
- out.writeObject(ref);
- out.close();
- } catch (IOException ex) {
- ex.printStackTrace();
- }
- }
-
- public void testConversationEnd() {
- String someState = "Some state";
- b.getService().setState(someState);
- b.getService().endConversation();
- Assert.assertNotSame(someState, b.getService().getState());
- }
-
- public void testConversationEnd2() {
- String someState = "Some state";
- b.getService().setState(someState);
- b.getService().endConversationViaCallback();
- Assert.assertNotSame(someState, b.getService().getState());
- }
-
- public void endConversation() {
- System.out.println("A-callback to end conversation");
- }
-
- public void testConversationEnd3() {
- String someState = "Some state";
- b.getService().setState(someState);
- delayForSeconds(2);
- try {
- b.getService().getState();
- } catch (ConversationEndedException e) {
- b.getConversation().end();// need to clean up to avoid exception
- }
- Assert.assertNotSame(someState, b.getService().getState());
- }
-
- public void testConversationEnd4() {
- String someState = "Some state";
- b.getService().setState(someState);
- b.getConversation().end();
- Assert.assertNotSame(someState, b.getService().getState());
- }
-
- public void testConversationEnd5() {
- String someState = "Some state";
- b.getService().setState(someState);
- try {
- b.getService().throwNonBusinessException();
- } catch (Error e) {
- // Expected
- }
- Assert.assertNotSame(someState, b.getService().getState());
- }
-
- public void testConversationEnd6() {
- String someState = "Some state";
- b.getService().setState(someState);
- Object id = b.getConversation().getConversationID();
- b.getService().endConversation();
- Assert.assertNotSame(someState, b.getService().getState());
- Assert.assertNotSame(id, b.getConversation().getConversationID());
- }
-
- public void testConversationEnd7() {
- b.getService().setState("Some state");
- b.getService().endConversation();
- Assert.assertNull(b.getConversationID());
- }
-
- public void testConversationEnd8() {
- String someState = "Some state";
- b.getService().setState(someState);
- delayForSeconds(2);
- b.getService().getState();
- }
-
- public void testConversationEnd9() {
- String someState = "Some state";
- b.getService().setState(someState);
- try {
- b.getService().throwBusinessException();
- } catch (BServiceBusinessException e) {
- // Expected
- }
- Assert.assertSame(someState, b.getService().getState());
- }
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
deleted file mode 100644
index 0919734c7a..0000000000
--- 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
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.AServiceCallback;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.BServiceBusinessException;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="1 seconds")
-public class BServiceImpl implements BService {
-
- String someState;
-
- @Callback
- protected AServiceCallback callback;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void endConversation() {
- System.out.println("Someone called Bservice.endsConversation()");
- }
-
- public void endConversationViaCallback() {
- callback.endConversation();
- }
-
- public void throwNonBusinessException() {
- throw new Error();
- }
-
- public void throwBusinessException() throws BServiceBusinessException {
- throw new BServiceBusinessException("Business Exception");
- }
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
deleted file mode 100644
index d9910d445c..0000000000
--- 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
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.CService;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(CService.class)
-@Scope("CONVERSATION")
-public class CServiceImpl implements CService {
-
- String someState;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
deleted file mode 100644
index 34c57e402e..0000000000
--- 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
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.impl;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.DService;
-import org.junit.Assert;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(DService.class)
-@Scope("CONVERSATION")
-public class DServiceImpl implements DService {
-
- String someState;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public void continueConversation(ServiceReference<BService> b, Object convId) {
-
- b.getService().setState("Some more state");
- Assert.assertEquals(convId, b.getConversation().getConversationID());
- }
-
- public void continueConversation2(String filename, Object convId, String serializedState) {
- ServiceReference<BService> b = readReference(filename);
- Assert.assertEquals(serializedState, b.getService().getState());
- Assert.assertEquals(convId, b.getConversation().getConversationID());
- }
-
- // Utilities
- @SuppressWarnings("unchecked")
- private ServiceReference<BService> readReference(String filename) {
- ServiceReference<BService> b = null;
- FileInputStream fis = null;
- ObjectInputStream in = null;
- try {
- fis = new FileInputStream(filename);
- in = new ObjectInputStream(fis);
- ServiceReference<BService> readObject = (ServiceReference<BService>)in.readObject();
- b = readObject;
- in.close();
- } catch (IOException ex) {
- ex.printStackTrace();
- } catch (ClassNotFoundException ex) {
- ex.printStackTrace();
- }
- return b;
- }
-}
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite b/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
deleted file mode 100644
index 21ee8acac1..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://java-api-tests" name="Converstion-Lifetime">
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.impl.AServiceImpl" />
- <reference name="b" target="BComponent" />
- <reference name="d" target="DComponent" />
- </component>
-
- <component name="BComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.impl.BServiceImpl" />
- </component>
-
- <component name="CComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.impl.CServiceImpl" />
- </component>
-
- <component name="DComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.impl.DServiceImpl" />
- </component>
-
-</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/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
deleted file mode 100644
index 987ac3539f..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.osoa.sca.ConversationEndedException;
-
-/**
- *
- */
-public class LifetimeTestCase {
-
- protected static String compositeName = "lifetime.composite";
- protected static AService aService = null;
-
- @BeforeClass
- public static void init() throws Exception {
- try {
- System.out.println("Setting up");
- ServiceFinder.init(compositeName);
- aService = ServiceFinder.getService(AService.class, "AComponent");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- @AfterClass
- public static void destroy() throws Exception {
-
- System.out.println("Cleaning up");
- ServiceFinder.cleanup();
-
- }
-
- /**
- * Lines 475, 476
- * <p>
- * Conversations start on the client side when one of the following occur: A
- * "@Reference" to a conversational service is injected, ... and then a
- * method of the service is called
- */
- @Test
- public void lifetime1() throws Exception {
- aService.testConversationStarted();
- }
-
- /**
- * Lines 477, 478, 479
- * <p>
- * Conversations start on the client side when one of the following occur
- * ... A call is made to CompositeContext.getServiceReference and then a
- * method of the service is called.
- */
- @Test
- //@Ignore("TUSCANY-2243")
- public void lifetime2() throws Exception {
- aService.testConversationStarted2();
- }
-
- /**
- * Line 481, 482
- * <p>
- * The client can continue an existing conversation, by: Holding the service
- * reference that was created when the conversation started
- */
- @Test
- public void lifetime3() throws Exception {
- aService.testConversationContinue();
- }
-
- /**
- * Line 481, 483
- * <p>
- * The client can continue an existing conversation, by: ... • Getting the
- * service reference object passed as a parameter from another service, even
- * remotely
- */
- @Test
- public void lifetime4() throws Exception {
- // aService.testConversationContinue2();
- }
-
- /**
- * Line 481, 484
- * <p>
- * The client can continue an existing conversation, by:<br> • Loading a
- * service reference that had been written to some form of persistent
- * storage
- */
- @Test
- public void lifetime6() throws Exception {
- aService.testConversationContinue3();
- }
-
- /**
- * Line 487, 488
- * <p>
- * A conversation ends, and any state associated with the conversation is
- * freed up, when: <br>
- * ...A server operation that has been annotated "@EndConveration" has been
- * called
- */
- @Test
- public void lifetime7() throws Exception {
- aService.testConversationEnd();
- }
-
- /**
- * Line 487, 489
- * <p>
- * A conversation ends, and any state associated with the conversation is
- * freed up, when: <br>
- * ...The server calls an "@EndsConversation" method on the "@Callback"
- * reference <br>
- */
- @Test
- public void lifetime8() throws Exception {
- aService.testConversationEnd2();
- }
-
- /**
- * Line 487, 490
- * <p>
- * 487 A conversation ends, and any state associated with the conversation
- * is freed up, when: <br>
- * ... The server's conversation lifetime timeout occurs
- */
- @Test
- public void lifetime9() throws Exception {
- aService.testConversationEnd3();
- }
-
- /**
- * Line 487, 491
- * <p>
- * A conversation ends, and any state associated with the conversation is
- * freed up, when: <br>
- * ...The client calls Conversation.end()
- */
- @Test
- public void lifetime10() throws Exception {
- aService.testConversationEnd4();
- }
-
- /**
- * Line 487, 492
- * <p>
- * A conversation ends, and any state associated with the conversation is
- * freed up, when: <br>
- * ...Any non-business exception is thrown by a conversational operation
- */
- @Test
- //@Ignore("TUSCANY-2283")
- public void lifetime11() throws Exception {
- aService.testConversationEnd5();
- aService.testConversationEnd9();
- }
-
- /**
- * Line 494, 495
- * <p>
- * If a method is invoked on a service reference after an
- * "@EndsConversation" method has been called then a new conversation will
- * automatically be started.
- */
- @Test
- public void lifetime12() throws Exception {
- aService.testConversationEnd6();
- }
-
- /**
- * Line 495, 496, 497
- * <p>
- * If ServiceReference.getConversationID() is called after the
- * "@EndsConversation" method: is called, but before the next conversation
- * has been started, it will return null.
- */
- @Test
- public void lifetime13() throws Exception {
- aService.testConversationEnd7();
- }
-
- /**
- * Line 498, 499
- * <p>
- * If a service reference is used after the service provider's conversation
- * timeout has caused the conversation to be ended, then
- * ConversationEndedException will be thrown.
- */
- @Test(expected = ConversationEndedException.class)
- public void lifetime14() throws Exception {
- aService.testConversationEnd8();
- }
-
-}
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/pom.xml b/branches/sca-java-1.5/vtest/java-api/conversation/parameters/pom.xml
deleted file mode 100644
index f4dafbbe80..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>java-api-annotations</artifactId>
- <version>1.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>vtest-java-api-conversation-parameters</artifactId>
- <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - Conversation - Parameters</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-</project>
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/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
deleted file mode 100644
index bd19b504d9..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.parameters;
-
-/**
- * Simple Remotable Service
- */
-public interface AService {
-
- public void setBStateThenGetCState();
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
deleted file mode 100644
index 8a5ef43a4b..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.parameters;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Local Service
- */
-@Remotable
-@Conversational
-public interface BService {
-
- public void setState(String someState);
- public String getState();
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
deleted file mode 100644
index e9a6dc469d..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.javaapi.conversation.parameters;
-
-import org.osoa.sca.ServiceReference;
-
-/**
- * Simple Local Service
- */
-public interface CService {
-
- public void setState(String someState);
- public String getState();
- public Object continueConversation(ServiceReference<BService> bref);
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
deleted file mode 100644
index 0ef2f219f7..0000000000
--- 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
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.impl;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.AService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.CService;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
- @Reference
- protected ServiceReference<BService> b;
-
- @Reference
- protected CService c;
-
- public void setBStateThenGetCState() {
- String someState = "set by A";
- b.getService().setState(someState);
- Assert.assertEquals(someState, c.continueConversation(b));
- }
-
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
deleted file mode 100644
index ab0b05d163..0000000000
--- 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
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.BService;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService {
-
- String someState;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
-}
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/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
deleted file mode 100644
index 27d0210fca..0000000000
--- 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
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.BService;
-import org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.CService;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CService.class)
-public class CServiceImpl implements CService {
-
- String someState;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- public String getState() {
- return someState;
- }
-
- public String continueConversation(ServiceReference<BService> bref) {
- return bref.getService().getState();
- }
-
-}
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite b/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
deleted file mode 100644
index a8500dfb09..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://java-api-tests" name="Converstion-Composite">
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.impl.AServiceImpl" />
- <reference name="b" target="BComponent" />
- <reference name="c" target="CComponent" />
- </component>
-
- <component name="BComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.impl.BServiceImpl" />
- </component>
-
- <component name="CComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.conversation.parameters.impl.CServiceImpl" />
- </component>
-
-</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/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
deleted file mode 100644
index 929fe06115..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.javaapi.conversation.parameters;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * This test class tests the Service annotation described in section 1.2.1 and
- * 1.8.17
- */
-public class ConversationParametersTestCase {
-
- protected static ServiceFinder serviceFinder;
- protected static String compositeName = "parameters.composite";
- protected static AService aService = null;
-
- @BeforeClass
- public static void init() throws Exception {
- try {
- System.out.println("Setting up");
- ServiceFinder.init(compositeName);
- aService = ServiceFinder.getService(AService.class, "AComponent");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- @AfterClass
- public static void destroy() throws Exception {
-
- System.out.println("Cleaning up");
- ServiceFinder.cleanup();
-
- }
-
- /**
- * Line 423, 424, 425:<br>
- * <p>
- * The service reference which represents a single conversation can be
- * passed as a parameter to another service, even if that other service is
- * remote. This may be used in order to allow one component to continue a
- * conversation that had been started by another.
- */
- @Test
- public void passParameter1() throws Exception {
- aService.setBStateThenGetCState();
- }
-
-}
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/pom.xml b/branches/sca-java-1.5/vtest/java-api/conversation/pom.xml
deleted file mode 100644
index 5c8ee059cb..0000000000
--- a/branches/sca-java-1.5/vtest/java-api/conversation/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>vtest-java-api</artifactId>
- <version>1.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>vtest-java-api-conversation</artifactId>
- <packaging>pom</packaging>
-
- <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Conversation</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>parameters</module>
- <module>lifetime</module>
- <module>id</module>
- <module>callback</module>
- <module>callbackmixed</module>
- </modules>
- </profile>
- </profiles>
-</project>