From 6d685c8e138af8d18bc71181ec630ccb9a17bdd9 Mon Sep 17 00:00:00 2001 From: nash Date: Wed, 6 Apr 2011 22:03:35 +0000 Subject: Tag for 1.6.2-RC1 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1089647 13f79535-47bb-0310-9956-ffa450edef68 --- .../vtest/java-api/conversation/id/pom.xml | 46 ++++++++ .../vtest/javaapi/conversation/id/AService.java | 39 +++++++ .../vtest/javaapi/conversation/id/BService.java | 41 +++++++ .../vtest/javaapi/conversation/id/CService.java | 37 +++++++ .../conversation/id/CustomConversationId.java | 54 ++++++++++ .../javaapi/conversation/id/impl/AServiceImpl.java | 69 ++++++++++++ .../javaapi/conversation/id/impl/BServiceImpl.java | 65 ++++++++++++ .../javaapi/conversation/id/impl/CServiceImpl.java | 56 ++++++++++ .../src/main/resources/conversation-id.composite | 40 +++++++ .../conversation/id/ConversationIDTestCase.java | 118 +++++++++++++++++++++ 10 files changed, 565 insertions(+) create mode 100644 sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/pom.xml create mode 100644 sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java create mode 100644 sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java create mode 100644 sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java create mode 100644 sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java create mode 100644 sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java create mode 100644 sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java create mode 100644 sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java create mode 100644 sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite create mode 100644 sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java (limited to 'sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id') diff --git a/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/pom.xml b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/pom.xml new file mode 100644 index 0000000000..2dc929d954 --- /dev/null +++ b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/pom.xml @@ -0,0 +1,46 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + java-api-annotations + 1.6.2 + ../pom.xml + + vtest-java-api-conversation-id + Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - Conversation - ID + + + + org.apache.tuscany.sca + tuscany-host-embedded + 1.6.2 + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 1.6.2 + runtime + + + + diff --git a/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java new file mode 100644 index 0000000000..f49952828c --- /dev/null +++ b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java @@ -0,0 +1,39 @@ +/* + * 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/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java new file mode 100644 index 0000000000..d4641c5ee6 --- /dev/null +++ b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java @@ -0,0 +1,41 @@ +/* + * 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/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java new file mode 100644 index 0000000000..66a9b3b6c3 --- /dev/null +++ b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java @@ -0,0 +1,37 @@ +/* + * 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/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java new file mode 100644 index 0000000000..ac40c56ee6 --- /dev/null +++ b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java @@ -0,0 +1,54 @@ +/* + * 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/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java new file mode 100644 index 0000000000..517976ff73 --- /dev/null +++ b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java @@ -0,0 +1,69 @@ +/* + * 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 b; + + @Reference + protected ServiceReference 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/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java new file mode 100644 index 0000000000..752476ebf7 --- /dev/null +++ b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java @@ -0,0 +1,65 @@ +/* + * 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/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java new file mode 100644 index 0000000000..a01ceb7be4 --- /dev/null +++ b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java @@ -0,0 +1,56 @@ +/* + * 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/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite new file mode 100644 index 0000000000..25e7154fca --- /dev/null +++ b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java new file mode 100644 index 0000000000..d3cb107a61 --- /dev/null +++ b/sca-java-1.x/tags/1.6.2-RC1/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java @@ -0,0 +1,118 @@ +/* + * 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 + *

+ * 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 + *

+ * The type of the field is not necessarily String + */ + @Test + public void idAnnotation2() throws Exception { + aService.testAnnotation2(); + } + + /** + * Lines 505, 506 + *

+ * System generated conversation IDs are always strings + */ + @Test + public void idAnnotation3() throws Exception { + aService.testAnnotation3(); + } + + /** + * Lines 506, 507 + *

+ * ... but application generated conversation IDs may be other complex + * types. + *

+ * Lines 513, 514 + *

+ * ... 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 + *

+ * 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(). + *

+ * 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(); + } + +} -- cgit v1.2.3