summaryrefslogtreecommitdiffstats
path: root/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation
diff options
context:
space:
mode:
Diffstat (limited to 'tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation')
-rw-r--r--tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/pom.xml46
-rw-r--r--tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java32
-rw-r--r--tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java37
-rw-r--r--tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java70
-rw-r--r--tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java59
-rw-r--r--tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite35
-rw-r--r--tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java112
7 files changed, 0 insertions, 391 deletions
diff --git a/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/pom.xml b/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/pom.xml
deleted file mode 100644
index 7be9fcca51..0000000000
--- a/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/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>2.0-M2</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>vtest-java-api-annotations-endsconversation</artifactId>
- <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Annotations - @EndsConversation</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>2.0-M2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-M2</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java b/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
deleted file mode 100644
index 13bcb1fd51..0000000000
--- a/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.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.annotations.endsconversation;
-
-/**
- * Simple Remotable Service
- */
-public interface AService {
-
- public void testAtEndsConversation();
-
- public void testSREndConversation();
-
- public void testTimedEnd();
-
-}
diff --git a/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java b/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
deleted file mode 100644
index 01d3ef051e..0000000000
--- a/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/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.annotations.endsconversation;
-
-import org.oasisopen.sca.annotation.Conversational;
-import org.oasisopen.sca.annotation.EndsConversation;
-
-/**
- * Simple Local Service
- */
-@Conversational
-public interface BService {
-
- public void setState(String someState);
-
- public String getConversationId();
-
- @EndsConversation
- public void endConversation();
-
-}
diff --git a/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java b/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
deleted file mode 100644
index 606020cf85..0000000000
--- a/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
+++ /dev/null
@@ -1,70 +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.annotations.endsconversation.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.endsconversation.AService;
-import org.apache.tuscany.sca.vtest.javaapi.annotations.endsconversation.BService;
-import org.oasisopen.sca.ServiceReference;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-import org.junit.Assert;
-
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
- @Reference
- protected BService b;
-
- @Reference
- protected ServiceReference<BService> b2;
-
- private void delayForSeconds(int numSeconds) {
- try {
- Thread.sleep(numSeconds * 1000);// millisecs
- } catch (InterruptedException ex) {
- throw new Error(ex);
- }
- }
-
- public void testAtEndsConversation() {
- String firstId;
- b.setState("SomeState");
- firstId = b.getConversationId();
- b.endConversation();
- b.setState("SomeState");// This should start a new conversation
- Assert.assertNotSame(b.getConversationId(), firstId);
- }
-
- public void testSREndConversation() {
- String firstId;
- b2.getService().setState("SomeState");
- firstId = b2.getService().getConversationId();
- b2.getConversation().end();
- b2.getService().setState("SomeState");// This should start a new conversation
- Assert.assertNotSame(b2.getService().getConversationId(), firstId);
- }
-
- public void testTimedEnd() {
- b.setState("someState");
- delayForSeconds(2);
- b.setState("someState"); // should fail w/ timeout
- }
-
-}
diff --git a/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java b/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
deleted file mode 100644
index 56644c6967..0000000000
--- a/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
+++ /dev/null
@@ -1,59 +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.annotations.endsconversation.impl;
-
-import org.apache.tuscany.sca.vtest.javaapi.annotations.endsconversation.BService;
-import org.oasisopen.sca.annotation.ConversationAttributes;
-import org.oasisopen.sca.annotation.ConversationID;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(BService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxIdleTime="1 seconds")
-public class BServiceImpl implements BService {
-
- String someState;
-
- protected String conversationId;
-
- public void setState(String someState) {
- this.someState = someState;
- }
-
- @ConversationID
- public void setConversationID (String id){
- this.conversationId = id;
- System.out.println("BService conversation ID =>" + conversationId);
- }
-
- public String getState() {
- return someState;
- }
-
- public String getConversationId() {
- return conversationId;
- }
-
- public void endConversation() {
- System.out.println("Conversation ended");
- }
-
-}
diff --git a/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite b/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
deleted file mode 100644
index cbc13e380c..0000000000
--- a/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.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="Converstion-Composite">
-
- <component name="AComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.annotations.endsconversation.impl.AServiceImpl" />
- <reference name="b" target="BComponent" />
- <reference name="b2" target="BComponent" />
- </component>
-
- <component name="BComponent">
- <implementation.java
- class="org.apache.tuscany.sca.vtest.javaapi.annotations.endsconversation.impl.BServiceImpl" />
- </component>
-
-</composite>
diff --git a/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java b/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
deleted file mode 100644
index 61d7e25187..0000000000
--- a/tags/java/sca/2.0-M2/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
+++ /dev/null
@@ -1,112 +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.annotations.endsconversation;
-
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.oasisopen.sca.ConversationEndedException;
-
-/**
- * This test class tests the Service annotation described in section 1.2.1 and
- * 1.8.17
- */
-public class EndsConversationTestCase {
-
- protected static String compositeName = "endsconversation.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 410,411,412,413:
- * <p>
- * A method of a conversational interface may be marked with an
- * "@EndsConversation" annotation. Once a method marked with
- * "@EndsConversation" has been called, the conversation between client and
- * service provider is at an end, which implies no further methods may be
- * called on that service within the *same* conversation.
- */
- @Test
- public void atEndsConversation1() throws Exception {
- aService.testAtEndsConversation();
- }
-
- /**
- * Lines 417,418,419,420:
- * <p>
- * From the errata: <br>
- * Solution: Replace lines 417-420 at the end of section 1.6.2.2 with the
- * following: "If a conversation is ended with an explicit outbound call to
- * an "@EndsConversation" method or a call to
- * ServiceReference.endConversation(), then any subsequent call to an
- * operation on the service reference will start a new conversation. If the
- * conversation ends for any other reason (e.g. a timeout occurred), then
- * until ServiceReference.getConversation().end() is called, the
- * ConversationEndedException will be thrown by any conversational
- * operation."
- * <p>
- * This tests the first section of the errata. Up to "start a new
- * conversation"
- */
- @Test
- public void atEndsConversation2() throws Exception {
- aService.testSREndConversation();
- }
-
- /**
- * Lines 417,418,419,420:
- * <p>
- * From the errata: <br>
- * Solution: Replace lines 417-420 at the end of section 1.6.2.2 with the
- * following: "If a conversation is ended with an explicit outbound call to
- * an "@EndsConversation" method or a call to
- * ServiceReference.endConversation(), then any subsequent call to an
- * operation on the service reference will start a new conversation. If the
- * conversation ends for any other reason (e.g. a timeout occurred), then
- * until ServiceReference.getConversation().end() is called, the
- * ConversationEndedException will be thrown by any conversational
- * operation."
- * <p>
- * This tests the second section of the errata. Starting with .. "If the
- * conversation ends for any other reason ..."
- */
- @Test(expected = ConversationEndedException.class)
- public void atEndsConversation3() throws Exception {
- aService.testTimedEnd();
- }
-}