Author: kwilliams
Date: Thu May 1 14:43:35 2008
New Revision: 652675
URL: http://svn.apache.org/viewvc?rev=652675&view=rev
Log:
Framework and first test for Conversation IDs, TUSCANY-2247
Added:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/pom.xml (with
props)
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
(with props)
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
(with props)
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
(with props)
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
(with props)
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/resources/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
(with props)
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/test/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/test/java/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/test/java/org/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/test/java/org/apache/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
(with props)
Modified:
incubator/tuscany/java/sca/vtest/java-api/conversation/pom.xml
Added: incubator/tuscany/java/sca/vtest/java-api/conversation/id/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/conversation/id/pom.xml?rev=652675&view=auto
==============================================================================
--- incubator/tuscany/java/sca/vtest/java-api/conversation/id/pom.xml (added)
+++ incubator/tuscany/java/sca/vtest/java-api/conversation/id/pom.xml Thu May
1 14:43:35 2008
@@ -0,0 +1,46 @@
+<?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-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>vtest-java-api-conversation-id</artifactId>
+ <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests -
Conversation - ID</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>2.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>2.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ </dependencies>
+</project>
Propchange: incubator/tuscany/java/sca/vtest/java-api/conversation/id/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/vtest/java-api/conversation/id/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/tuscany/java/sca/vtest/java-api/conversation/id/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java?rev=652675&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
Thu May 1 14:43:35 2008
@@ -0,0 +1,31 @@
+/*
+ * 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
+ */
[EMAIL PROTECTED]
+public interface AService {
+
+ public void testAnnotation();
+
+}
Propchange:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java?rev=652675&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
Thu May 1 14:43:35 2008
@@ -0,0 +1,38 @@
+/*
+ * 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
+ */
[EMAIL PROTECTED]
[EMAIL PROTECTED]
+public interface BService {
+
+ public void setState(String someState);
+
+ public String getState();
+
+ public void testAnnotation();
+
+
+}
Propchange:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java?rev=652675&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
Thu May 1 14:43:35 2008
@@ -0,0 +1,42 @@
+/*
+ * 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.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
[EMAIL PROTECTED](AService.class)
[EMAIL PROTECTED]("CONVERSATION")
+public class AServiceImpl implements AService {
+
+ @Reference
+ protected ServiceReference<BService> b;
+
+ public void testAnnotation() {
+ b.getService().testAnnotation();
+
+ }
+
+
+}
Propchange:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java?rev=652675&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
Thu May 1 14:43:35 2008
@@ -0,0 +1,53 @@
+/*
+ * 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;
+
[EMAIL PROTECTED](BService.class)
[EMAIL PROTECTED]("CONVERSATION")
[EMAIL PROTECTED](maxAge="1 seconds")
+public class BServiceImpl implements BService {
+
+ String someState;
+
+ @ConversationID
+ protected String conversationID;
+
+ public void setState(String someState) {
+ this.someState = someState;
+ }
+
+ public String getState() {
+ return someState;
+ }
+
+ public void testAnnotation() {
+ Assert.assertNotNull(conversationID);
+ System.out.println(conversationID);
+ }
+
+
+}
Propchange:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite?rev=652675&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
Thu May 1 14:43:35 2008
@@ -0,0 +1,34 @@
+<?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.id.impl.AServiceImpl"
/>
+ <reference name="b" target="BComponent" />
+ </component>
+
+ <component name="BComponent">
+ <implementation.java
+
class="org.apache.tuscany.sca.vtest.javaapi.conversation.id.impl.BServiceImpl"
/>
+ </component>
+
+</composite>
Propchange:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java?rev=652675&view=auto
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
(added)
+++
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
Thu May 1 14:43:35 2008
@@ -0,0 +1,70 @@
+/*
+ * 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.host.embedded.SCADomain;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.osoa.sca.ConversationEndedException;
+
+/**
+ *
+ */
+public class ConversationIDTestCase {
+
+ protected static SCADomain domain;
+ 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");
+ domain = SCADomain.newInstance(compositeName);
+ aService = domain.getService(AService.class, "AComponent");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ @AfterClass
+ public static void destroy() throws Exception {
+
+ System.out.println("Cleaning up");
+ if (domain != null)
+ domain.close();
+
+ }
+
+ /**
+ * 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 lifetime1() throws Exception {
+ aService.testAnnotation();
+ }
+
+}
Propchange:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/vtest/java-api/conversation/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/conversation/pom.xml?rev=652675&r1=652674&r2=652675&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/java-api/conversation/pom.xml (original)
+++ incubator/tuscany/java/sca/vtest/java-api/conversation/pom.xml Thu May 1
14:43:35 2008
@@ -55,6 +55,7 @@
<modules>
<module>parameters</module>
<module>lifetime</module>
+ <module>id</module>
</modules>
</profile>
</profiles>
