Moving 1.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835132 13f79535-47bb-0310-9956-ffa450edef68

309 files changed, 18369 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/pom.xml
new file mode 100644
index 0000000000..ab34ce4b5f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/pom.xml
@@ -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>1.5-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>vtest-java-api-annotations-conversation</artifactId>
+    <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - Annotations - @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>
+</project>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
new file mode 100644
index 0000000000..bc7212f70c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
@@ -0,0 +1,30 @@
+/*
+ * 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.conversational;
+
+/**
+ * Simple Remotable Service
+ */
+public interface AService {
+
+    public String setThenGetB1State(String someState);
+    
+    public String setThenGetB2State(String someState);
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
new file mode 100644
index 0000000000..76c857126a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
@@ -0,0 +1,29 @@
+/*
+ * 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.conversational;
+
+/**
+ * Simple Local Service
+ */
+public interface B1Service {
+
+    public void setState(String someState);
+    public String getState();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
new file mode 100644
index 0000000000..b67d89d3e2
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
@@ -0,0 +1,32 @@
+/*
+ * 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.conversational;
+
+import org.osoa.sca.annotations.Conversational;
+
+/**
+ * Simple Local Service
+ */
+@Conversational
+public interface B2Service {
+
+    public void setState(String someState);
+    public String getState();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
new file mode 100644
index 0000000000..55d87c9546
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
@@ -0,0 +1,47 @@
+/*
+ * 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.conversational.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.conversational.AService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.conversational.B1Service;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.conversational.B2Service;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+@Service(AService.class)
+public class AServiceImpl implements AService {
+
+    @Reference
+    protected B1Service b1;
+
+    @Reference
+    protected B2Service b2;
+
+    public String setThenGetB1State(String someState) {
+        b1.setState(someState);
+        return b1.getState();
+    }
+
+    public String setThenGetB2State(String someState) {
+        b2.setState(someState);
+        return b2.getState();
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
new file mode 100644
index 0000000000..457b18e60a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
@@ -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.annotations.conversational.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.conversational.B1Service;
+import org.osoa.sca.annotations.Service;
+
+@Service(B1Service.class)
+public class B1ServiceImpl implements B1Service {
+
+    String someState;
+
+    public void setState(String someState) {
+        this.someState = someState;
+    }
+
+    public String getState() {
+        return someState;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
new file mode 100644
index 0000000000..d6252f0a0c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
@@ -0,0 +1,40 @@
+/*
+ * 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.conversational.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.conversational.B2Service;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(B2Service.class)
+@Scope("COMPOSITE")
+public class B2ServiceImpl implements B2Service {
+
+    String someState;
+
+    public void setState(String someState) {
+        this.someState = someState;
+    }
+
+    public String getState() {
+        return someState;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
new file mode 100644
index 0000000000..4c2de35d52
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
@@ -0,0 +1,40 @@
+<?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.conversational.impl.AServiceImpl" />
+		<reference name="b1" target="B1Component" />
+		<reference name="b2" target="B2Component" />
+	</component>
+
+	<component name="B1Component">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.conversational.impl.B1ServiceImpl" />
+	</component>
+
+	<component name="B2Component">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.conversational.impl.B2ServiceImpl" />
+	</component>
+
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
new file mode 100644
index 0000000000..c00d5f1c10
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
@@ -0,0 +1,91 @@
+/*
+ * 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.conversational;
+
+import junit.framework.Assert;
+
+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 ConversationAnnotationTestCase {
+
+    protected static String compositeName = "conversation.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 328:<br>
+     * <p>
+     * When "@Conversational" is not specified on a service interface, the
+     * service contract is stateless.<br>
+     * <p>
+     * Line 394, 395: <br>
+     * A service may be declared as conversational by marking its Java interface
+     * with "@Conversational". If a service interface is not marked with
+     * "@Conversational", it is stateless. <br>
+     * <p>
+     * BService has no "@Conversation" annotation so communication from A-> is
+     * stateless
+     */
+    @Test
+    public void atConversation1() throws Exception {
+        String thisState = "This State";
+        Assert.assertNotSame(thisState, aService.setThenGetB1State(thisState));
+    }
+
+    /**
+     * Line 325-327:<br>
+     * <p>
+     * Java service interfaces may be annotated to specify whether their
+     * contract is conversational as described in the Assembly Specification
+     * by using the "@Conversational" annotation. A conversational service
+     * indicates that requests to the service are correlated in some way
+     */
+    @Test
+    public void atConversation2() throws Exception {
+        String thisState = "This State";
+        Assert.assertSame(thisState, aService.setThenGetB2State(thisState));
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/pom.xml
new file mode 100644
index 0000000000..072b82fa00
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/pom.xml
@@ -0,0 +1,53 @@
+<?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-annotations-conversationattributes</artifactId>
+    <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - Annotations - @ConversationAttributes</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>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy-security</artifactId>
+            <version>1.5-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+    </dependencies>
+</project>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
new file mode 100644
index 0000000000..a3f1f11826
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
@@ -0,0 +1,30 @@
+/*
+ * 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.conversationattributes;
+
+/**
+ * Simple Service
+ */
+public interface AService {
+
+    public void testMaxAge() throws InterruptedException;
+    public void testMaxIdle() throws InterruptedException;
+    public void testSinglePrincipal();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
new file mode 100644
index 0000000000..8a1ed23b9d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
@@ -0,0 +1,32 @@
+/*
+ * 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.conversationattributes;
+
+import org.osoa.sca.annotations.Conversational;
+
+/**
+ * Simple Service
+ */
+@Conversational
+public interface B2Service {
+
+    public void setState(String someState);
+    public String getState();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
new file mode 100644
index 0000000000..1d215100f7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
@@ -0,0 +1,32 @@
+/*
+ * 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.conversationattributes;
+
+import org.osoa.sca.annotations.Conversational;
+
+/**
+ * Simple Service
+ */
+@Conversational
+public interface BService {
+
+    public void setState(String someState);
+    public String getState();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
new file mode 100644
index 0000000000..cd4f29ea5b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
@@ -0,0 +1,30 @@
+/*
+ * 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.conversationattributes;
+
+import org.osoa.sca.ServiceReference;
+
+/**
+ * Simple Service
+ */
+public interface CService {
+
+    public void testSinglePricipal(ServiceReference<BService> bReference);
+    
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
new file mode 100644
index 0000000000..64b99c9f98
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
@@ -0,0 +1,80 @@
+/*
+ * 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.conversationattributes.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.AService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.B2Service;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.BService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.CService;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+@Service(AService.class)
+public class AServiceImpl implements AService {
+
+    @Reference
+    protected BService b;
+    
+    @Reference
+    protected B2Service b2;
+
+    @Reference
+    protected CService c;
+    
+    @Context 
+    protected ComponentContext context;
+    
+    private void delayForSeconds(int numSeconds) {
+        try {
+            Thread.sleep(numSeconds * 1000);// millisecs
+        } catch (InterruptedException ex) {
+            throw new Error(ex);
+        }
+    }
+
+    public void testMaxAge() {
+
+        String someState = "someState";
+        b.setState(someState);
+        delayForSeconds(2);
+        b.setState(someState);
+
+    }
+    
+    public void testMaxIdle() {
+
+        String someState = "someState";
+        b2.setState(someState);
+        delayForSeconds(2);
+        b2.setState(someState);
+
+    }
+
+    public void testSinglePrincipal() {
+        
+        b.setState("Some state");
+        System.out.println("Calling c and passing reference to b");
+        c.testSinglePricipal(context.getServiceReference(BService.class, "b"));
+        
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
new file mode 100644
index 0000000000..0d34b802e1
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
@@ -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.annotations.conversationattributes.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.BService;
+import org.osoa.sca.annotations.ConversationAttributes;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(BService.class)
+@Scope("CONVERSATION")
+@ConversationAttributes(maxIdleTime="1 seconds")
+public class B2ServiceImpl implements BService {
+
+    String someState;
+
+    public void setState(String someState) {
+        this.someState = someState;
+    }
+
+    public String getState() {
+        return someState;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
new file mode 100644
index 0000000000..762c9533d0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
@@ -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.annotations.conversationattributes.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.BService;
+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", singlePrincipal=true)
+public class BServiceImpl implements BService {
+
+    String someState;
+
+    public void setState(String someState) {
+        this.someState = someState;
+    }
+
+    public String getState() {
+        return someState;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
new file mode 100644
index 0000000000..3ebf63ba54
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.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.annotations.conversationattributes.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.BService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.CService;
+import org.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Service;
+
+@Service(CService.class)
+public class CServiceImpl implements CService {
+
+    public void testSinglePricipal(ServiceReference<BService> bReference) {
+        
+        System.out.println("In C calling set state on passed reference to B");
+        bReference.getService().setState("someState");
+
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
new file mode 100644
index 0000000000..3820240ee2
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
@@ -0,0 +1,50 @@
+/*
+ * 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.conversationattributes.security;
+
+import java.io.IOException;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ACallbackHandler implements CallbackHandler {
+
+    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+        for (int i = 0; i < callbacks.length; i++) {
+            if (callbacks[i] instanceof NameCallback) {
+                NameCallback nc = (NameCallback)callbacks[i];
+                nc.setName("AUser");
+            } else if (callbacks[i] instanceof PasswordCallback) {
+                PasswordCallback pc = (PasswordCallback)callbacks[i];
+                pc.setPassword("AUserPasswd".toCharArray());
+            } else {
+                throw new UnsupportedCallbackException
+                 (callbacks[i], "Unsupported Callback!");
+            }
+          }
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
new file mode 100644
index 0000000000..75573b838d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
@@ -0,0 +1,179 @@
+/*
+ * 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.conversationattributes.security;
+
+import java.security.Principal;
+import java.util.Map;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
+
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class JaasLoginModule implements LoginModule {
+
+    private CallbackHandler callbackHandler;
+    private Subject subject;
+    private Principal userPrincipal;
+    private String userId;
+    private String password;
+    private boolean succeeded;
+    private boolean commitSucceeded;
+
+    public void initialize(Subject subject,
+                           CallbackHandler callbackHandler,
+                           Map<String, ?> sharedState,
+                           Map<String, ?> options) {
+        this.callbackHandler = callbackHandler;
+        this.subject = subject;
+    }
+
+    public boolean login() throws LoginException {
+        Callback[] callbacks = new Callback[2];
+        callbacks[0] = new NameCallback("UserId:");
+        callbacks[1] = new PasswordCallback("Password:", false);
+
+        try {
+            callbackHandler.handle(callbacks);
+            userId = ((NameCallback)callbacks[0]).getName();
+            password = new String(((PasswordCallback)callbacks[1]).getPassword());
+
+            if (userId.equals("CalculatorUser") && password.equals("CalculatorUserPasswd")) {
+                System.out.println("Successfully AUTHENTICATED!!");
+                succeeded = true;
+                return true;
+            } else {
+                System.out.println("Incorrect userId / password! AUTHENTICATION FAILED!!");
+                return false;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * <p> This method is called if the LoginContext's
+     * overall authentication succeeded
+     * (the relevant REQUIRED, REQUISITE, SUFFICIENT and OPTIONAL LoginModules
+     * succeeded).
+     *
+     * <p> If this LoginModule's own authentication attempt
+     * succeeded (checked by retrieving the private state saved by the
+     * <code>login</code> method), then this method associates a
+     * <code>UserPrincipal</code>
+     * with the <code>Subject</code> located in the
+     * <code>LoginModule</code>.  If this LoginModule's own
+     * authentication attempted failed, then this method removes
+     * any state that was originally saved.
+     *
+     * <p>
+     *
+     * @exception LoginException if the commit fails.
+     *
+     * @return true if this LoginModule's own login and commit
+     *          attempts succeeded, or false otherwise.
+     */
+    public boolean commit() throws LoginException {
+        if (succeeded == false) {
+            return false;
+        } else {
+            // add a Principal (authenticated identity) to the Subject
+
+            // assume the user we authenticated is the UserPrincipal
+            userPrincipal = new UserPrincipal(userId);
+            if (!subject.getPrincipals().contains(userPrincipal))
+                subject.getPrincipals().add(userPrincipal);
+
+            // in any case, clean out state
+            userId = null;
+            password = null;
+            commitSucceeded = true;
+            return true;
+        }
+    }
+
+    /**
+     * <p> This method is called if the LoginContext's
+     * overall authentication failed.
+     * (the relevant REQUIRED, REQUISITE, SUFFICIENT and OPTIONAL LoginModules
+     * did not succeed).
+     *
+     * <p> If this LoginModule's own authentication attempt
+     * succeeded (checked by retrieving the private state saved by the
+     * <code>login</code> and <code>commit</code> methods),
+     * then this method cleans up any state that was originally saved.
+     *
+     * <p>
+     *
+     * @exception LoginException if the abort fails.
+     *
+     * @return false if this LoginModule's own login and/or commit attempts
+     *          failed, and true otherwise.
+     */
+    public boolean abort() throws LoginException {
+        if (succeeded == false) {
+            return false;
+        } else if (succeeded == true && commitSucceeded == false) {
+            // login succeeded but overall authentication failed
+            succeeded = false;
+            userId = null;
+            password = null;
+            userPrincipal = null;
+        } else {
+            // overall authentication succeeded and commit succeeded,
+            // but someone else's commit failed
+            logout();
+        }
+        return true;
+    }
+
+    /**
+     * Logout the user.
+     *
+     * <p> This method removes the <code>SimplePrincipal</code>
+     * that was added by the <code>commit</code> method.
+     *
+     * <p>
+     *
+     * @exception LoginException if the logout fails.
+     *
+     * @return true in all cases since this <code>LoginModule</code>
+     *          should not be ignored.
+     */
+    public boolean logout() throws LoginException {
+        subject.getPrincipals().remove(userPrincipal);
+        succeeded = false;
+        succeeded = commitSucceeded;
+        userId = null;
+        if (password != null)
+            password = null;
+        userPrincipal = null;
+        return true;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
new file mode 100644
index 0000000000..8349e775c5
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
@@ -0,0 +1,66 @@
+/**
+ * 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.conversationattributes.security;
+
+import java.security.Principal;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class UserPrincipal implements Principal {
+
+    private final String name;
+
+    public UserPrincipal(String name) {
+        if (name == null)
+            throw new IllegalArgumentException("name cannot be null");
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String toString() {
+        return name;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        final UserPrincipal other = (UserPrincipal)obj;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        return true;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
new file mode 100644
index 0000000000..9d5aec8ed5
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
@@ -0,0 +1,3 @@
+AService {

+  org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.security.JaasLoginModule required debug=true;

+};

diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
new file mode 100644
index 0000000000..49391b3353
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
@@ -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.
+-->
+<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.conversationattributes.impl.AServiceImpl" />
+		<reference name="b" target="BComponent" />
+		<reference name="b2" target="B2Component" />
+		<reference name="c" target="CComponent" />
+	</component>
+
+	<component name="BComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.impl.BServiceImpl" />
+	</component>
+
+    <component name="B2Component">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.impl.B2ServiceImpl" />
+	</component>
+
+	<component name="CComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.impl.CServiceImpl" />
+	</component>
+
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
new file mode 100644
index 0000000000..d3573176a3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+    * 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.    
+-->
+<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
+    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+    xmlns:convatt="http://convatt">
+
+    <!-- PolicySets -->
+    <policySet name="JaasPolicy" provides="tuscany:jaasAuthentication" appliesTo="sca:implementation.java"
+        xmlns="http://www.osoa.org/xmlns/sca/1.0">
+        <tuscany:jaasAuthentication>
+            <tuscany:configurationName>AService</tuscany:configurationName>
+            <tuscany:callbackHandler>org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.security.ACallbackHandler</tuscany:callbackHandler>
+        </tuscany:jaasAuthentication>
+    </policySet>
+
+</definitions>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
new file mode 100644
index 0000000000..c10369c9bd
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
@@ -0,0 +1,38 @@
+<?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" 
+	xmlns:sample="http://java-api-tests" 
+	name="SinglePrincipal"
+	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
+
+	<component name="AComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.impl.AServiceImpl"
+			requires = "tuscany:jaasAuthentication" />
+		<reference name="c" target="CComponent" />
+	</component>
+
+	<component name="CComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.conversationattributes.impl.CServiceImpl" />
+	</component>
+
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
new file mode 100644
index 0000000000..570237ccf4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
@@ -0,0 +1,93 @@
+/*
+ * 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.conversationattributes;
+
+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;
+
+/**
+ * This test class tests the Service annotation described in section 1.2.1 and
+ * 1.8.17
+ */
+public class ConversationAttributesAnnotationTestCase {
+
+    protected static String compositeName = "conversation.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 1665, 1666
+     * <p>
+     * maxIdleTime (optional) - The maximum time that can pass between
+     * operations within a single conversation. If more time than this passes,
+     * then the container may end the conversation.
+     */
+    @Test(expected = ConversationEndedException.class)
+    public void maxIdle() throws Exception {
+        aService.testMaxIdle();
+    }
+
+    /**
+     * Line 1667, 1668
+     * <p>
+     * maxAge (optional) - The maximum time that the entire conversation can
+     * remain active. If more time than this passes, then the container may end
+     * the conversation.
+     */
+    @Test(expected = ConversationEndedException.class)
+    public void maxAge() throws Exception {
+        aService.testMaxAge();
+    }
+
+    /**
+     * Line 1669, 1670
+     * <p>
+     * singlePrincipal (optional) – If true, only the principal (the user) that
+     * started the conversation has authority to continue the conversation.
+     * The default value is false.
+     */
+    @Ignore("TUSCANY-2608")
+    @Test(expected = Exception.class)
+    public void singlePrincipal() throws Exception {
+        aService.testSinglePrincipal();
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
new file mode 100644
index 0000000000..4ebd667a00
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
@@ -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.annotations.conversationattributes;
+
+import javax.security.auth.login.Configuration;
+
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * 
+ */
+public class SinglePricipalTestCase {
+
+    protected static String compositeName = "singleprincipal.composite";
+    protected static AService aService = null;
+
+    @Before
+    public void init() throws Exception {
+        try {
+            Configuration.getConfiguration();
+        } catch (java.lang.SecurityException e) {
+            System.out.println("Caught SecurityException");
+            System.setProperty("java.security.auth.login.config", this.getClass().getClassLoader()
+                .getResource("AJass.config").toString());
+        }
+        System.out.println("Setting up");
+        ServiceFinder.init(compositeName);
+        aService = ServiceFinder.getService(AService.class, "AComponent");
+    }
+
+    @After
+    public void destroy() throws Exception {
+
+        System.out.println("Cleaning up");
+        ServiceFinder.cleanup();
+
+    }
+
+    /**
+     * Line 1669, 1670
+     * <p>
+     * singlePrincipal (optional) – If true, only the principal (the user) that
+     * started the conversation has authority to continue the conversation. The
+     * default value is false.
+     */
+    @Test(expected = Exception.class)
+    public void singlePrincipal() throws Exception {
+        aService.testSinglePrincipal();
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/pom.xml
new file mode 100644
index 0000000000..247eefff02
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/pom.xml
@@ -0,0 +1,44 @@
+<?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-annotations-destroy</artifactId>
+    <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - Annotations - @Destroy</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
new file mode 100644
index 0000000000..039689805c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
@@ -0,0 +1,29 @@
+/*
+ * 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.destroy;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * The interface for AService
+ */
+@Remotable
+public interface AService {
+    public String getGreetings(String name);
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
new file mode 100644
index 0000000000..0b30bb8644
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.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.annotations.destroy.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.AService;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements AService. The implementation has an error since it annotates a protected
+ * method with "@Destroy".
+ */
+@Service(AService.class)
+public class AServiceErr1Impl implements AService {
+
+    @Destroy
+    protected void destroy() {
+    }
+    
+    public String getGreetings(String name) {
+        return "Hello " + name;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
new file mode 100644
index 0000000000..33b2e01bcb
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.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.annotations.destroy.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.AService;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements AService. The implementation has an error since it annotates a private
+ * method with "@Destroy".
+ */
+@Service(AService.class)
+public class AServiceErr2Impl implements AService {
+
+    @Destroy
+    private void destroy() {
+    }
+    
+    public String getGreetings(String name) {
+        return "Hello " + name;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
new file mode 100644
index 0000000000..d5630e859e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
@@ -0,0 +1,40 @@
+/*
+ * 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.destroy.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.AService;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements AService. The implementation has an error since it annotates a
+ * method with non-void return type with "@Destroy".
+ */
+@Service(AService.class)
+public class AServiceErr3Impl implements AService {
+
+    @Destroy
+    public String destroy() {
+        return null;
+    }
+    
+    public String getGreetings(String name) {
+        return "Hello " + name;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
new file mode 100644
index 0000000000..b8f384704a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.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.annotations.destroy.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.AService;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements AService. The implementation has an error since it annotates a
+ * method with arguments with "@Destroy".
+ */
+@Service(AService.class)
+public class AServiceErr4Impl implements AService {
+
+    @Destroy
+    public void destroy(int x) {
+    }
+    
+    public String getGreetings(String name) {
+        return "Hello " + name;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
new file mode 100644
index 0000000000..75a00447f3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
@@ -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.annotations.destroy.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.AService;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements AService.
+ */
+@Service(AService.class)
+public class AServiceImpl implements AService {
+
+    @Destroy
+    public void destroy() {
+    }
+    
+    public String getGreetings(String name) {
+        return "Hello " + name;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
new file mode 100644
index 0000000000..b03a0defe5
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
@@ -0,0 +1,28 @@
+<?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://vtest"
+           xmlns:vtest="http://vtest"
+           name="AServiceErr1">
+
+    <component name="AComponent">
+		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.impl.AServiceErr1Impl"/>
+    </component>
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
new file mode 100644
index 0000000000..93aafdd971
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
@@ -0,0 +1,28 @@
+<?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://vtest"
+           xmlns:vtest="http://vtest"
+           name="AServiceErr2">
+
+    <component name="AComponent">
+		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.impl.AServiceErr2Impl"/>
+    </component>
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
new file mode 100644
index 0000000000..eb8f6e59ca
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
@@ -0,0 +1,28 @@
+<?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://vtest"
+           xmlns:vtest="http://vtest"
+           name="AServiceErr3">
+
+    <component name="AComponent">
+		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.impl.AServiceErr3Impl"/>
+    </component>
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
new file mode 100644
index 0000000000..296a386876
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
@@ -0,0 +1,28 @@
+<?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://vtest"
+           xmlns:vtest="http://vtest"
+           name="AServiceErr4">
+
+    <component name="AComponent">
+		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.impl.AServiceErr4Impl"/>
+    </component>
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
new file mode 100644
index 0000000000..4373bc2558
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
@@ -0,0 +1,28 @@
+<?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://vtest"
+           xmlns:vtest="http://vtest"
+           name="AService">
+
+    <component name="AComponent">
+		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.destroy.impl.AServiceImpl"/>
+    </component>
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
new file mode 100644
index 0000000000..f3b2f28200
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
@@ -0,0 +1,159 @@
+/*
+ * 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.destroy;
+
+import java.io.File;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.junit.Test;
+import org.osoa.sca.ServiceRuntimeException;
+
+/**
+ * This test class tests the "@Destroy" annotation described in section 1.8.8.
+ */
+public class DestroyAnnotationTestCase {
+
+    /**
+     * Lines 1225, 1226, 1227<br>
+     * The "@Destroy" annotation type is used to annotate a Java class method
+     * that will be called when the scope defined for the local service
+     * implemented by the class ends. The method must have a void return value
+     * and no arguments. The annotated method must be public.
+     * <p>
+     * This method tests a proper destroy method. i.e., public, no arguments and
+     * with void return type.
+     */
+    @Test
+    public void atDestroyProper() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        SCANode node = nodeFactory.createSCANode(new File("src/main/resources/proper/AService.composite").toURL().toString(),
+                new SCAContribution("TestContribution", 
+                                    new File("src/main/resources/proper").toURL().toString()));
+        node.start();
+        AService aService = ((SCAClient)node).getService(AService.class, "AComponent");
+        Assert.assertEquals("Hello Pandu", aService.getGreetings("Pandu"));
+        node.stop();
+    }
+
+    /**
+     * Lines 1225, 1226, 1227<br>
+     * The "@Destroy" annotation type is used to annotate a Java class method
+     * that will be called when the scope defined for the local service
+     * implemented by the class ends. The method must have a void return value
+     * and no arguments. The annotated method must be public.
+     * <p>
+     * This method tests that an exception is thrown when a protected method is
+     * annotated with "@Destroy".
+     */
+    @Test
+    public void atDestroyProtectedMethod() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        try {
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err1/AServiceErr1.composite").toURL().toString(),
+                    new SCAContribution("TestContribution", 
+                                        new File("src/main/resources/err1").toURL().toString()));
+            Assert.fail();
+            node.stop();
+        } catch(ServiceRuntimeException e) {
+            //expected
+            Assert.assertNotSame(-1, e.getMessage().indexOf("Destructor must be a public method."));
+        }
+    }
+
+    /**
+     * Lines 1225, 1226, 1227<br>
+     * The "@Destroy" annotation type is used to annotate a Java class method
+     * that will be called when the scope defined for the local service
+     * implemented by the class ends. The method must have a void return value
+     * and no arguments. The annotated method must be public.
+     * <p>
+     * This method tests that an exception is thrown when a private method is
+     * annotated with "@Destroy".
+     */
+    @Test
+    public void atDestroyPrivateMethod() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        try {
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err2/AServiceErr2.composite").toURL().toString(),
+                    new SCAContribution("TestContribution", 
+                                        new File("src/main/resources/err2").toURL().toString()));
+            Assert.fail();
+            node.stop();
+        } catch(ServiceRuntimeException e) {
+            //expected
+            Assert.assertNotSame(-1, e.getMessage().indexOf("Destructor must be a public method."));
+        }
+    }
+
+    /**
+     * Lines 1225, 1226, 1227<br>
+     * The "@Destroy" annotation type is used to annotate a Java class method
+     * that will be called when the scope defined for the local service
+     * implemented by the class ends. The method must have a void return value
+     * and no arguments. The annotated method must be public.
+     * <p>
+     * This method tests that an exception is thrown when a method with non-void
+     * return type is annotated with "@Destroy".
+     */
+    @Test
+    public void atDestroyNonVoidReturnType() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        try {
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err3/AServiceErr3.composite").toURL().toString(),
+                    new SCAContribution("TestContribution", 
+                                        new File("src/main/resources/err3").toURL().toString()));
+            Assert.fail();
+            node.stop();
+        } catch(ServiceRuntimeException e) {
+            //expected
+            Assert.assertNotSame(-1, e.getMessage().indexOf("Destructor must return void."));
+        }
+    }
+
+    /**
+     * Lines 1225, 1226, 1227<br>
+     * The "@Destroy" annotation type is used to annotate a Java class method
+     * that will be called when the scope defined for the local service
+     * implemented by the class ends. The method must have a void return value
+     * and no arguments. The annotated method must be public.
+     * <p>
+     * This method tests that an exception is thrown when a method with arguments is
+     * annotated with "@Destroy".
+     */
+    @Test
+    public void atDestroyMethodWithArgs() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        try {
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err4/AServiceErr4.composite").toURL().toString(),
+                    new SCAContribution("TestContribution", 
+                                        new File("src/main/resources/err4").toURL().toString()));
+            Assert.fail();
+            node.stop();
+        } catch(ServiceRuntimeException e) {
+            //expected
+            Assert.assertNotSame(-1, e.getMessage().indexOf("Destructor must not have argments"));
+        }
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/pom.xml
new file mode 100644
index 0000000000..9498f8cc8b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/pom.xml
@@ -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>1.5-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>vtest-java-api-annotations-endsconversation</artifactId>
+    <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - Annotations - @EndsConversation</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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
new file mode 100644
index 0000000000..13bcb1fd51
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
@@ -0,0 +1,32 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
new file mode 100644
index 0000000000..5400c1fe0d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.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.annotations.endsconversation;
+
+import org.osoa.sca.annotations.Conversational;
+import org.osoa.sca.annotations.EndsConversation;
+
+/**
+ * Simple Local Service
+ */
+@Conversational
+public interface BService {
+
+    public void setState(String someState);
+    
+    public String getConversationId();
+    
+    @EndsConversation
+    public void endConversation();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
new file mode 100644
index 0000000000..ed564ddbdc
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
@@ -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.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.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
new file mode 100644
index 0000000000..418fb93c68
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
@@ -0,0 +1,59 @@
+/*
+ * 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.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(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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
new file mode 100644
index 0000000000..cbc13e380c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
@@ -0,0 +1,35 @@
+<?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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
new file mode 100644
index 0000000000..1ddd711a31
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
@@ -0,0 +1,112 @@
+/*
+ * 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.osoa.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();
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/pom.xml
new file mode 100644
index 0000000000..a826f0962b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/pom.xml
@@ -0,0 +1,44 @@
+<?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-annotations-init</artifactId>
+    <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - Annotations - @Init</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
new file mode 100644
index 0000000000..edf13010f5
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
@@ -0,0 +1,30 @@
+/*
+ * 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.init;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * The interface for AService
+ */
+@Remotable
+public interface AService {
+    public String getGreetings(String name);
+    public boolean isInitProper();
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
new file mode 100644
index 0000000000..5d53510462
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
@@ -0,0 +1,43 @@
+/*
+ * 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.init.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.init.AService;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements AService. The implementation has an error since it annotates a protected
+ * method with "@Init".
+ */
+@Service(AService.class)
+public class AServiceErr1Impl implements AService {
+
+    @Init
+    protected void init() {
+    }
+    
+    public String getGreetings(String name) {
+        return "Hello " + name;
+    }
+    
+    public boolean isInitProper() {
+        return false;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
new file mode 100644
index 0000000000..43c1a8cffa
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
@@ -0,0 +1,43 @@
+/*
+ * 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.init.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.init.AService;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements AService. The implementation has an error since it annotates a private
+ * method with "@Init".
+ */
+@Service(AService.class)
+public class AServiceErr2Impl implements AService {
+
+    @Init
+    private void init() {
+    }
+    
+    public String getGreetings(String name) {
+        return "Hello " + name;
+    }
+    
+    public boolean isInitProper() {
+        return false;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
new file mode 100644
index 0000000000..f5cac472c0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
@@ -0,0 +1,44 @@
+/*
+ * 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.init.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.init.AService;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements AService. The implementation has an error since it annotates a
+ * method with non-void return type with "@Init".
+ */
+@Service(AService.class)
+public class AServiceErr3Impl implements AService {
+
+    @Init
+    public String init() {
+        return null;
+    }
+    
+    public String getGreetings(String name) {
+        return "Hello " + name;
+    }
+    
+    public boolean isInitProper() {
+        return false;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
new file mode 100644
index 0000000000..b7c17ee535
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
@@ -0,0 +1,43 @@
+/*
+ * 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.init.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.init.AService;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements AService. The implementation has an error since it annotates a
+ * method with arguments with "@Init".
+ */
+@Service(AService.class)
+public class AServiceErr4Impl implements AService {
+
+    @Init
+    public void init(int x) {
+    }
+    
+    public String getGreetings(String name) {
+        return "Hello " + name;
+    }
+    
+    public boolean isInitProper() {
+        return false;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
new file mode 100644
index 0000000000..c2adea1426
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
@@ -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.annotations.init.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.init.AService;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements AService.
+ */
+@Service(AService.class)
+public class AServiceImpl implements AService {
+
+    private boolean initProper;
+    
+    @Property
+    public String someProperty;
+    
+    @Reference
+    public AService someReference;
+
+    @Init
+    public void init() {
+        initProper = someProperty != null && someReference != null;
+    }
+    
+    public String getGreetings(String name) {
+        return "Hello " + name;
+    }
+    
+    public boolean isInitProper() {
+        return initProper;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
new file mode 100644
index 0000000000..01b8e101e0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
@@ -0,0 +1,28 @@
+<?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://vtest"
+           xmlns:vtest="http://vtest"
+           name="AServiceErr1">
+
+    <component name="AServiceComponent">
+		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.init.impl.AServiceErr1Impl"/>
+    </component>
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
new file mode 100644
index 0000000000..4ae38d44b6
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
@@ -0,0 +1,28 @@
+<?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://vtest"
+           xmlns:vtest="http://vtest"
+           name="AServiceErr2">
+
+    <component name="AComponent">
+		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.init.impl.AServiceErr2Impl"/>
+    </component>
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
new file mode 100644
index 0000000000..6bc3d8e7fc
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
@@ -0,0 +1,28 @@
+<?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://vtest"
+           xmlns:vtest="http://vtest"
+           name="AServiceErr3">
+
+    <component name="AComponent">
+		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.init.impl.AServiceErr3Impl"/>
+    </component>
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
new file mode 100644
index 0000000000..7ade16e6d3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
@@ -0,0 +1,28 @@
+<?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://vtest"
+           xmlns:vtest="http://vtest"
+           name="AServiceErr4">
+
+    <component name="AComponent">
+		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.init.impl.AServiceErr4Impl"/>
+    </component>
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
new file mode 100644
index 0000000000..35f13a2ae6
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
@@ -0,0 +1,33 @@
+<?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://vtest"
+           xmlns:vtest="http://vtest"
+           name="AService">
+
+    <component name="AComponent">
+		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.init.impl.AServiceImpl"/>
+		<property name="someProperty">hello</property>
+		<reference name="someReference" target="AnotherAComponent"/>
+    </component>
+    <component name="AnotherAComponent">
+		<implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.init.impl.AServiceImpl"/>
+    </component>
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
new file mode 100644
index 0000000000..0dbccd8611
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
@@ -0,0 +1,167 @@
+/*
+ * 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.init;
+
+import java.io.File;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.junit.Test;
+import org.osoa.sca.ServiceRuntimeException;
+
+/**
+ * This test class tests the "@Init" annotation described in section 1.8.11.
+ */
+public class InitAnnotationTestCase {
+
+    /**
+     * Lines 1290, 1291, 1292, 1293 <br>
+     * The "@Init" annotation type is used to annotate a Java class method that
+     * is called when the scope defined for the local service implemented by the
+     * class starts. The method must have a void return value and no arguments.
+     * The annotated method must be public. The annotated method is called after
+     * all property and reference injection is complete.
+     * <p>
+     * This method tests a proper init method i.e., public, no arguments and with
+     * void return type.<br>
+     * Expected result: Method must be called. Method must be called after all property
+     * and reference injection is complete.
+     */
+    @Test
+    public void atInitProper() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        SCANode node = nodeFactory.createSCANode(new File("src/main/resources/proper/AService.composite").toURL().toString(),
+                new SCAContribution("TestContribution", 
+                                    new File("src/main/resources/proper").toURL().toString()));
+        node.start();
+        AService aService = ((SCAClient)node).getService(AService.class, "AComponent");
+        Assert.assertTrue(aService.isInitProper());
+        Assert.assertEquals("Hello Pandu", aService.getGreetings("Pandu"));
+        node.stop();
+    }
+
+    /**
+     * Lines 1290, 1291, 1292, 1293 <br>
+     * The "@Init" annotation type is used to annotate a Java class method that
+     * is called when the scope defined for the local service implemented by the
+     * class starts. The method must have a void return value and no arguments.
+     * The annotated method must be public. The annotated method is called after
+     * all property and reference injection is complete.
+     * <p>
+     * This method tests that an exception is thrown when a protected method is
+     * annotated with "@Init".
+     */
+    @Test
+    public void atInitProtectedMethod() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        try {
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err1/AServiceErr1.composite").toURL().toString(),
+                    new SCAContribution("TestContribution", 
+                                        new File("src/main/resources/err1").toURL().toString()));
+            Assert.fail();
+            node.stop();
+        } catch(ServiceRuntimeException e) {
+            //expected
+            Assert.assertNotSame(-1, e.getMessage().indexOf("Initializer must be a public method."));
+        }
+    }
+
+    /**
+     * Lines 1290, 1291, 1292, 1293 <br>
+     * The "@Init" annotation type is used to annotate a Java class method that
+     * is called when the scope defined for the local service implemented by the
+     * class starts. The method must have a void return value and no arguments.
+     * The annotated method must be public. The annotated method is called after
+     * all property and reference injection is complete.
+     * <p>
+     * This method tests that an exception is thrown when a private method is
+     * annotated with "@Init".
+     */
+    @Test
+    public void atInitPrivateMethod() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        try {
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err2/AServiceErr2.composite").toURL().toString(),
+                    new SCAContribution("TestContribution", 
+                                        new File("src/main/resources/err2").toURL().toString()));
+            Assert.fail();
+            node.stop();
+        } catch(ServiceRuntimeException e) {
+            //expected
+            Assert.assertNotSame(-1, e.getMessage().indexOf("Initializer must be a public method."));
+        }
+    }
+
+    /**
+     * Lines 1290, 1291, 1292, 1293 <br>
+     * The "@Init" annotation type is used to annotate a Java class method that
+     * is called when the scope defined for the local service implemented by the
+     * class starts. The method must have a void return value and no arguments.
+     * The annotated method must be public. The annotated method is called after
+     * all property and reference injection is complete.
+     * <p>
+     * This method tests that an exception is thrown when a method with non-void
+     * return type is annotated with "@Init".
+     */
+    @Test
+    public void atInitNonVoidReturnType() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        try {
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err3/HelloWorldErr3.composite").toURL().toString(),
+                    new SCAContribution("TestContribution", 
+                                        new File("src/main/resources/err3").toURL().toString()));
+            Assert.fail();
+            node.stop();
+        } catch(ServiceRuntimeException e) {
+            //expected
+            Assert.assertNotSame(-1, e.getMessage().indexOf("Initializer must return void."));
+        }
+    }
+
+    /**
+     * Lines 1290, 1291, 1292, 1293 <br>
+     * The "@Init" annotation type is used to annotate a Java class method that
+     * is called when the scope defined for the local service implemented by the
+     * class starts. The method must have a void return value and no arguments.
+     * The annotated method must be public. The annotated method is called after
+     * all property and reference injection is complete.
+     * <p>
+     * This method tests that an exception is thrown when a method with arguments is
+     * annotated with "@Init".
+     */
+    @Test
+    public void atInitMethodWithArgs() throws Exception {
+        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        try {
+            SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err4/HelloWorldErr4.composite").toURL().toString(),
+                    new SCAContribution("TestContribution", 
+                                        new File("src/main/resources/err4").toURL().toString()));
+            Assert.fail();
+            node.stop();
+        } catch(ServiceRuntimeException e) {
+            //expected
+            Assert.assertNotSame(-1, e.getMessage().indexOf("Initializer must not have argments"));
+        }
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/pom.xml
new file mode 100644
index 0000000000..b489ddc6fa
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/pom.xml
@@ -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>1.5-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>vtest-java-api-annotations-oneway</artifactId>
+    <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - Annotations - @OneWay</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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
new file mode 100644
index 0000000000..6fef2afa2a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
@@ -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.annotations.oneway;
+
+import org.osoa.sca.annotations.OneWay;
+
+/**
+ * Simple Remotable Service
+ */
+public interface AService {
+
+    @OneWay
+    public void setNameOneWay(String name);
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
new file mode 100644
index 0000000000..1cb4f3adf5
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
@@ -0,0 +1,28 @@
+/*
+ * 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.oneway;
+
+/**
+ * Simple Local Service
+ */
+public interface BService {
+
+    public void setNameOneWay(String name);
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
new file mode 100644
index 0000000000..4829ffb95f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.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.annotations.oneway.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.oneway.AService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.oneway.BService;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+@Service(AService.class)
+public class AServiceImpl implements AService {
+
+    @Reference
+    protected BService b;
+
+    public void setNameOneWay(String name) {
+        b.setNameOneWay(name);
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
new file mode 100644
index 0000000000..09c783ae96
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
@@ -0,0 +1,43 @@
+/*
+ * 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.oneway.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.oneway.BService;
+import org.osoa.sca.annotations.Service;
+
+@Service(BService.class)
+public class BServiceImpl implements BService {
+
+    String name;
+
+    private void delay2Seconds() {
+        try {
+            Thread.sleep(2000);// millisecs
+        } catch (InterruptedException ex) {
+            throw new Error(ex);
+        }
+    }
+
+    public void setNameOneWay(String name) {
+        delay2Seconds();
+        this.name = name;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
new file mode 100644
index 0000000000..47a7a98c7d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
@@ -0,0 +1,35 @@
+<?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="OneWay-Composite">
+
+	<component name="AComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.oneway.impl.AServiceImpl" />
+        <reference name="b" target="BComponent"/>		
+	</component>
+
+	<component name="BComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.oneway.impl.BServiceImpl" />
+	</component>
+
+
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
new file mode 100644
index 0000000000..f2fb8d0dc8
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
@@ -0,0 +1,78 @@
+/*
+ * 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.oneway;
+
+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 OneWayAnnotationTestCase {
+
+    protected static String compositeName = "oneway.composite";
+    protected static AService aService = null;
+    protected static BService bService = 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 384,385,386:<br>
+     * <p>
+     * Any method that returns "void" and has no declared exceptions may be
+     * marked with an "@OneWay" annotation. This means that the method is
+     * non-blocking and communication with the service provider may use a
+     * binding that buffers the requests and sends it at some later time.
+     * <p>
+     * Line 1319, 1320:<br>
+     * <p>
+     * The "@OneWay" annotation type is used to annotate a Java interface method
+     * to indicate that invocations will be dispatched in a non-blocking fashion
+     * as described in the section on Asynchronous Programming.<br>
+     * <p>
+     * The serviceMethod on A is annotated with "@OneWay". The A implementation
+     * delegates to b's method which includes a 2 seconds delay. So, this will
+     * fail if the call to A is blocking.
+     */
+    @Test(timeout = 500)
+    public void atOneWay1() throws Exception {
+        aService.setNameOneWay("Some Name");
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/pom.xml
new file mode 100644
index 0000000000..4b5e743b16
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/pom.xml
@@ -0,0 +1,69 @@
+<?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>java-api-annotations</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - Annotations</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>reference</module>
+                <module>service</module>
+                <module>property</module>
+                <module>scope</module>
+                <module>init</module>
+                <module>destroy</module>
+                <module>oneway</module>
+                <module>conversational</module>
+                <module>conversationattributes</module>
+                <module>endsconversation</module>
+           </modules>
+        </profile>
+    </profiles>
+</project>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/pom.xml
new file mode 100644
index 0000000000..bcdd3ad712
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/pom.xml
@@ -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>1.5-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>vtest-java-api-annotations-property</artifactId>
+    <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - Annotations - @Property</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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
new file mode 100644
index 0000000000..5cfea1b099
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
@@ -0,0 +1,82 @@
+/*
+ * 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.property;
+
+/**
+ * Simple Service
+ */
+public interface AService {
+
+    public String getName();
+    
+    public String getP1();
+
+    public String getP2();
+
+    public String getP3();
+
+    public String getP4();
+
+    public String getP5();
+
+    public String getP6();
+
+    public String getP7AString();
+    
+    public int getP7BInt();
+    
+    public String getP8AString();
+    
+    public int getP8BInt();
+    
+    public String getP9AString();
+    
+    public int getP9BInt();
+    
+    public String getP10AString();
+    
+    public int getP10BInt();
+    
+    public String getP11AString();
+    
+    public int getP11BInt();
+    
+    public String getP12AString();
+    
+    public int getP12BInt();
+    
+    public String getP15();
+
+    public String getP16();
+    
+    public String getP17();
+    
+    public String getP18();
+    
+	public int getP19Size();
+
+	public String getP20(int i);
+
+	public int getP20Size();
+
+	public int getP21(int i);
+
+	public int getP21Size();
+	
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
new file mode 100644
index 0000000000..5ddc59f8b6
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
@@ -0,0 +1,48 @@
+/*
+ * 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.property;
+
+/**
+ * Simple Service
+ */
+public interface AnotherAService {
+
+    public String getName();
+    
+    public String getP13();
+
+    public String getP14();
+    
+	public String getP22();
+
+	public String getP23();
+
+	public String getP24();
+
+	public String getP25();
+
+    public boolean getP14SetterIsCalled();
+    
+    public boolean getP23SetterIsCalled();
+    
+    public boolean getP24SetterIsCalled();
+    
+    public boolean getP25SetterIsCalled();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
new file mode 100644
index 0000000000..99fb842a9a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
@@ -0,0 +1,32 @@
+/*
+ * 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.property;
+
+import org.osoa.sca.annotations.Remotable;
+
+
+/**
+ * Simple Service used by another service
+ */
+@Remotable
+public interface BService {
+
+    String getName();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
new file mode 100644
index 0000000000..5de3b5fcff
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
@@ -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.annotations.property;
+
+
+/**
+ * Simple Service used by another service
+ */
+public interface CService {
+
+    String getName();
+
+	public String getB1Name();
+	
+	public String getP2();
+
+	public int getP3();
+
+	public String getP4();
+
+	public String getConstructor();
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
new file mode 100644
index 0000000000..f30c4c69fc
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
@@ -0,0 +1,35 @@
+/*
+ * 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.property.impl;
+
+/**
+ * A simple object to hold a string
+ */
+public class AObject {
+
+    public String aString;
+    public int bInt;
+
+    public AObject() {
+        this.aString = null;
+        this.bInt = 0;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
new file mode 100644
index 0000000000..b385083533
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
@@ -0,0 +1,240 @@
+/*
+ * 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.property.impl;
+
+import java.util.List;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.property.AService;
+import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.Property;
+
+@Service(AService.class)
+public class AServiceImpl implements AService {
+
+	@Property
+	protected String p1;			// simple Java type injected via field
+	
+	@Property
+	public String p2;				// simple Java type injected via field
+
+	protected String p3;			// simple Java type injected via setter
+	
+	public String p4;				// simple Java type injected via setter
+
+	protected String p5;			// simple Java type injected via constructor parameter
+	
+	public String p6;				// simple Java type injected via constructor parameter
+
+	@Property(required=true)
+	protected AObject p7;			// complex Java type injected via field
+	
+	@Property
+	public AObject p8;				// complex Java type injected via field
+
+	protected AObject p9;			// complex Java type injected via setter
+	
+	public AObject p10;				// complex Java type injected via setter
+
+	protected AObject p11;			// complex Java type injected via constructor parameter
+	
+	public AObject p12;				// complex Java type injected via constructor parameter
+
+	@Property(name="pFifteen")
+	protected String p15;			// injected via field with different name
+
+	protected String p16;			// injected via setter with different name
+
+	@Property(name="p17", required=false)
+	public String p17;				// injected via field but not defined in composite
+
+	public String p18;				// injected via setter but not defined in composite
+
+	@Property(name="p19", required=true)
+	public List<String> p19;		// a List and injected via field with no element
+
+	public List<String> p20;		// a List and injected via setter
+
+	@Property(required=false)
+	public Integer[] p21;			// an array and injected via field
+	
+    public String getName() {
+        return "AService";
+    }
+    
+    public AServiceImpl(
+    		@Property(name = "p5") String p5, 
+    		@Property(name = "p6") String p6,
+    		@Property(name = "p11") AObject p11,
+    		@Property(name = "p12") AObject p12
+    		) {
+    	super();
+    	this.p5 = p5;
+    	this.p6 = p6;
+    	this.p11 = p11;
+    	this.p12 = p12;
+    }
+
+    @Property
+    public void setP3(String p3) {
+		this.p3 = p3;
+	}
+
+    @Property(required=true)
+    public void setP4(String p4) {
+		this.p4 = p4;
+	}
+
+    @Property
+    public void setP9(AObject p9) {
+		this.p9 = p9;
+	}
+
+    @Property
+    public void setP10(AObject p10) {
+		this.p10 = p10;
+	}
+    
+    @Property(name="pSixteen")
+    public void setP16(String p16) {
+		this.p16 = p16;
+	}
+    
+	@Property(name="p18", required=false)
+    public void setP18(String p18) {
+		this.p18 = p18;
+	}
+    
+	@Property(name="p20", required=true)
+	public void setP20(List<String> p20) {
+		this.p20 = p20;
+	}
+
+	public String getP1() {
+		return p1;
+	}
+
+	public String getP2() {
+		return p2;
+	}
+
+	public String getP3() {
+		return p3;
+	}
+
+	public String getP4() {
+		return p4;
+	}
+
+	public String getP5() {
+		return p5;
+	}
+
+	public String getP6() {
+		return p6;
+	}
+
+	public String getP7AString() {
+		return p7.aString;
+	}
+
+	public int getP7BInt() {
+		return p7.bInt;
+	}
+	
+	public String getP8AString() {
+		return p8.aString;
+	}
+
+	public int getP8BInt() {
+		return p8.bInt;
+	}
+	
+	public String getP9AString() {
+		return p9.aString;
+	}
+
+	public int getP9BInt() {
+		return p9.bInt;
+	}
+	
+	public String getP10AString() {
+		return p10.aString;
+	}
+
+	public int getP10BInt() {
+		return p10.bInt;
+	}
+
+	public String getP11AString() {
+		return p11.aString;
+	}
+
+	public int getP11BInt() {
+		return p11.bInt;
+	}
+
+	public String getP12AString() {
+		return p12.aString;
+	}
+
+	public int getP12BInt() {
+		return p12.bInt;
+	}
+
+	public String getP15() {
+		return p15;
+	}
+
+	public String getP16() {
+		return p16;
+	}
+
+	public String getP17() {
+		return p17;
+	}
+
+	public String getP18() {
+		return p18;
+	}
+
+	public int getP19Size() {
+		return p19.size();
+	}
+
+	public String getP20(int i) {
+		return p20.get(i);
+	}
+
+	public int getP20Size() {
+		return p20.size();
+	}
+
+	public int getP21(int i) {
+		return p21[i].intValue();
+	}
+
+	public int getP21Size() {
+		return p21.length;
+	}
+
+}
+
+
+
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
new file mode 100644
index 0000000000..fd1ba5ee52
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
@@ -0,0 +1,116 @@
+/*
+ * 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.property.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.property.AnotherAService;
+import org.osoa.sca.annotations.Service;
+
+@Service(AnotherAService.class)
+public class AnotherAServiceImpl implements AnotherAService {
+
+    public String p13;              // injected via field and un-annotated
+    
+    public String p14;              // injected via setter and un-annotated
+    
+    protected String p22;           // unannotated protected field should not be injected
+
+    protected String p23;			// un-annotated protected and has protected setter 
+
+    protected String p24;			// un-annotated protected field and has public setter
+
+    private String p25;				// un-annotated private field and has public setter
+    
+    public boolean p14SetterIsCalled = false;
+    
+    public boolean p23SetterIsCalled = false;
+    
+    public boolean p24SetterIsCalled = false;
+    
+    public boolean p25SetterIsCalled = false;
+    
+    
+    public String getName() {
+        return "AService";
+    }
+    
+    public void setP14(String p14) {
+        p14SetterIsCalled = true;
+        this.p14 = p14;
+    }
+
+    protected void setP23(String p23) {
+        p23SetterIsCalled = true;
+        this.p23 = p23;
+    }
+
+    public void setP24(String p24) {
+        p24SetterIsCalled = true;
+        this.p24 = p24;
+    }
+
+    public void setP25(String p25) {
+        p25SetterIsCalled = true;
+        this.p25 = p25;
+    }
+
+    public String getP13() {
+        return p13;
+    }
+    
+    public String getP14() {
+        return p14;
+    }
+    
+    public String getP22() {
+        return p22;
+    }
+
+    public String getP23() {
+        return p23;
+    }
+
+    public String getP24() {
+        return p24;
+    }
+
+    public String getP25() {
+        return p25;
+    }
+
+    public boolean getP14SetterIsCalled() {
+        return p14SetterIsCalled;
+    }
+    
+
+    public boolean getP23SetterIsCalled() {
+        return p23SetterIsCalled;
+    }
+    
+
+    public boolean getP24SetterIsCalled() {
+        return p24SetterIsCalled;
+    }
+    
+
+    public boolean getP25SetterIsCalled() {
+        return p25SetterIsCalled;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
new file mode 100644
index 0000000000..f22f4a35b7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
@@ -0,0 +1,32 @@
+/*
+ * 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.property.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.property.BService;
+import org.osoa.sca.annotations.Service;
+
+@Service(BService.class)
+public class BServiceImpl implements BService {
+
+    public String getName() {
+        return "BService";
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
new file mode 100644
index 0000000000..280d2275f8
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
@@ -0,0 +1,87 @@
+/*
+ * 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.property.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.property.BService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.property.CService;
+import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+@Service(CService.class)
+public class CServiceImpl1 implements CService {
+
+	public BService b1;
+
+	public String p2;
+	
+	public int p3;
+
+	public String p4;
+	
+	public String constructor; 
+		
+	@Constructor
+	public CServiceImpl1() {
+		constructor = "NoArgument";
+	}
+	
+	public CServiceImpl1(@Reference(name = "bOne") BService b1, @Property(name = "pTwo") String p2, @Property(name = "pThree") int p3, @Property(name = "pFour") String p4) {
+		this.b1 = b1;
+		this.p2 = p2;
+		this.p3 = p3;
+		this.p4 = p4;
+		constructor = "AllArguments";
+	}
+
+	public CServiceImpl1(BService bOne, String pTwo, int pThree) {
+		this.b1 = bOne;
+		this.p2 = pTwo;
+		this.p3 = pThree;
+		constructor = "LessArguments";
+	}
+
+    public String getName() {
+        return "BService";
+    }
+
+	public String getB1Name() {
+		if (b1 == null)
+			return null;
+		return b1.getName();
+	}
+
+	public String getP2() {
+		return p2;
+	}
+
+	public int getP3() {
+		return p3;
+	}
+
+	public String getConstructor() {
+		return constructor;
+	}
+
+	public String getP4() {
+		return p4;
+	}
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
new file mode 100644
index 0000000000..6bc4384e73
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
@@ -0,0 +1,87 @@
+/*
+ * 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.property.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.property.BService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.property.CService;
+import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+@Service(CService.class)
+public class CServiceImpl2 implements CService {
+
+	public BService b1;
+
+	public String p2;
+	
+	public int p3;
+
+	public String p4;
+	
+	public String constructor; 
+		
+	public CServiceImpl2() {
+		constructor = "NoArgument";
+	}
+	
+	@Constructor()
+	public CServiceImpl2(@Reference(name = "bOne") BService b1, @Property(name = "pTwo") String p2, @Property(name = "pThree") int p3, @Property(name = "pFour") String p4) {
+		this.b1 = b1;
+		this.p2 = p2;
+		this.p3 = p3;
+		this.p4 = p4;
+		constructor = "AllArguments";
+	}
+
+	public CServiceImpl2(BService bOne, String pTwo, int pThree) {
+		this.b1 = bOne;
+		this.p2 = pTwo;
+		this.p3 = pThree;
+		constructor = "LessArguments";
+	}
+
+    public String getName() {
+        return "BService";
+    }
+
+	public String getB1Name() {
+		if (b1 == null)
+			return null;
+		return b1.getName();
+	}
+
+	public String getP2() {
+		return p2;
+	}
+
+	public int getP3() {
+		return p3;
+	}
+
+	public String getConstructor() {
+		return constructor;
+	}
+
+	public String getP4() {
+		return p4;
+	}
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
new file mode 100644
index 0000000000..6715b64fad
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
@@ -0,0 +1,87 @@
+/*
+ * 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.property.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.property.BService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.property.CService;
+import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+@Service(CService.class)
+public class CServiceImpl3 implements CService {
+
+	public BService b1;
+
+	public String p2;
+	
+	public int p3;
+
+	public String p4;
+	
+	public String constructor; 
+		
+	public CServiceImpl3() {
+		constructor = "NoArgument";
+	}
+	
+	@Constructor({"bOne", "pTwo", "pThree", "pFour"})
+	public CServiceImpl3(@Reference(name = "bOne") BService b1, @Property(name = "pTwo") String p2, @Property(name = "pThree") int p3, @Property(name = "pFour") String p4) {
+		this.b1 = b1;
+		this.p2 = p2;
+		this.p3 = p3;
+		this.p4 = p4;
+		constructor = "AllArguments";
+	}
+
+	public CServiceImpl3(BService bOne, String pTwo, int pThree) {
+		this.b1 = bOne;
+		this.p2 = pTwo;
+		this.p3 = pThree;
+		constructor = "LessArguments";
+	}
+
+    public String getName() {
+        return "BService";
+    }
+
+	public String getB1Name() {
+		if (b1 == null)
+			return null;
+		return b1.getName();
+	}
+
+	public String getP2() {
+		return p2;
+	}
+
+	public int getP3() {
+		return p3;
+	}
+
+	public String getConstructor() {
+		return constructor;
+	}
+
+	public String getP4() {
+		return p4;
+	}
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
new file mode 100644
index 0000000000..e10f07b0be
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
@@ -0,0 +1,88 @@
+/*
+ * 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.property.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.property.BService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.property.CService;
+import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+@Service(CService.class)
+public class CServiceImpl4 implements CService {
+
+	public BService b1;
+
+	public String p2;
+	
+	public int p3;
+
+	public String p4;
+	
+	public String constructor; 
+		
+	public CServiceImpl4() {
+		constructor = "NoArgument";
+	}
+	
+	public CServiceImpl4(@Reference(name = "bOne") BService b1, @Property(name = "pTwo") String p2, @Property(name = "pThree") int p3, @Property(name = "pFour") String p4, int extra) {
+		this.b1 = b1;
+		this.p2 = p2;
+		this.p3 = p3;
+		this.p4 = p4;
+		constructor = "ExtraArguments";
+	}
+
+	@Constructor({"bOne", "pTwo", "pThree", "pFour"})
+	public CServiceImpl4(BService bOne, String pTwo, int pThree, String pFour) {
+		this.b1 = bOne;
+		this.p2 = pTwo;
+		this.p3 = pThree;
+		this.p4 = pFour;
+		constructor = "AllArguments";
+	}
+
+    public String getName() {
+        return "BService";
+    }
+
+	public String getB1Name() {
+		if (b1 == null)
+			return null;
+		return b1.getName();
+	}
+
+	public String getP2() {
+		return p2;
+	}
+
+	public int getP3() {
+		return p3;
+	}
+
+	public String getConstructor() {
+		return constructor;
+	}
+
+	public String getP4() {
+		return p4;
+	}
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
new file mode 100644
index 0000000000..9a23e2de8d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
@@ -0,0 +1,88 @@
+/*
+ * 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.property.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.property.BService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.property.CService;
+import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+@Service(CService.class)
+public class CServiceImpl5 implements CService {
+
+	public BService b1;
+
+	public String p2;
+	
+	public int p3;
+
+	public String p4;
+	
+	public String constructor; 
+		
+	public CServiceImpl5() {
+		constructor = "NoArgument";
+	}
+	
+	public CServiceImpl5(@Reference(name = "bOne") BService b1, @Property(name = "pTwo") String p2, @Property(name = "pThree") int p3, @Property(name = "pFour") String p4, int extra) {
+		this.b1 = b1;
+		this.p2 = p2;
+		this.p3 = p3;
+		this.p4 = p4;
+		constructor = "ExtraArguments";
+	}
+
+	@Constructor({"bOne", "pFour", "pThree", "pTwo"})
+	public CServiceImpl5(BService bOne, String pTwo, int pThree, String pFour) {
+		this.b1 = bOne;
+		this.p2 = pTwo;
+		this.p3 = pThree;
+		this.p4 = pFour;
+		constructor = "SwitchedValues";
+	}
+
+    public String getName() {
+        return "BService";
+    }
+
+	public String getB1Name() {
+		if (b1 == null)
+			return null;
+		return b1.getName();
+	}
+
+	public String getP2() {
+		return p2;
+	}
+
+	public int getP3() {
+		return p3;
+	}
+
+	public String getConstructor() {
+		return constructor;
+	}
+
+	public String getP4() {
+		return p4;
+	}
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
new file mode 100644
index 0000000000..b4797595ac
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
@@ -0,0 +1,88 @@
+/*
+ * 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.property.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.property.BService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.property.CService;
+import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+@Service(CService.class)
+public class CServiceImpl6 implements CService {
+
+	public BService b1;
+
+	public String p2;
+	
+	public int p3;
+
+	public String p4;
+	
+	public String constructor; 
+		
+	public CServiceImpl6() {
+		constructor = "NoArgument";
+	}
+	
+	public CServiceImpl6(@Reference(name = "bOne") BService b1, @Property(name = "pTwo") String p2, @Property(name = "pThree") int p3, @Property(name = "pFour") String p4, int extra) {
+		this.b1 = b1;
+		this.p2 = p2;
+		this.p3 = p3;
+		this.p4 = p4;
+		constructor = "ExtraArguments";
+	}
+
+	@Constructor({"bOne", "pTwo", "pThree", "pWrong"})
+	public CServiceImpl6(BService bOne, String pTwo, int pThree, String pFour) {
+		this.b1 = bOne;
+		this.p2 = pTwo;
+		this.p3 = pThree;
+		this.p4 = pFour;
+		constructor = "WrongValues";
+	}
+
+    public String getName() {
+        return "BService";
+    }
+
+	public String getB1Name() {
+		if (b1 == null)
+			return null;
+		return b1.getName();
+	}
+
+	public String getP2() {
+		return p2;
+	}
+
+	public int getP3() {
+		return p3;
+	}
+
+	public String getConstructor() {
+		return constructor;
+	}
+
+	public String getP4() {
+		return p4;
+	}
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/resources/property.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/resources/property.composite
new file mode 100644
index 0000000000..f7af170f33
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/resources/property.composite
@@ -0,0 +1,143 @@
+<?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="Property-Composite">
+
+	<component name="AComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.AServiceImpl" />
+			<property name="p1">p1</property>
+			<property name="p2">p2</property>
+			<property name="p3">p3</property>
+			<property name="p4">p4</property>
+			<property name="p5">p5</property>
+			<property name="p6">p6</property>
+			<property name="p7" type="AObject">
+				<AObject xmlns="">
+					<aString>p7.aString</aString>
+					<bInt>7</bInt>
+				</AObject>
+			</property>
+			<property name="p8" type="AObject">
+				<AObject xmlns="">
+					<aString>p8.aString</aString>
+					<bInt>8</bInt>
+				</AObject>
+			</property>
+			<property name="p9" type="AObject">
+				<AObject xmlns="">
+					<aString>p9.aString</aString>
+					<bInt>9</bInt>
+				</AObject>
+			</property>
+			<property name="p10" type="AObject">
+				<AObject xmlns="">
+					<aString>p10.aString</aString>
+					<bInt>10</bInt>
+				</AObject>
+			</property>
+			<property name="p11" type="AObject">
+				<AObject xmlns="">
+					<aString>p11.aString</aString>
+					<bInt>11</bInt>
+				</AObject>
+			</property>
+			<property name="p12" type="AObject">
+				<AObject xmlns="">
+					<aString>p12.aString</aString>
+					<bInt>12</bInt>
+				</AObject>
+			</property>
+			<property name="pFifteen">p15</property>
+			<property name="pSixteen">p16</property>
+			<property name="p19" many="true"></property>
+			<property name="p20" many="true">"p20"</property>
+			<property name="p21" many="true">2 1 21</property>
+	</component>
+
+	<component name="CComponent1">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.CServiceImpl1" />
+			<reference name="bOne" target="BComponent"/>
+			<property name="pTwo">p2</property>
+			<property name="pThree">3</property>
+			<property name="pFour">p4</property>
+	</component>
+
+	<component name="CComponent2">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.CServiceImpl2" />
+			<reference name="bOne" target="BComponent"/>
+			<property name="pTwo">p2</property>
+			<property name="pThree">3</property>
+			<property name="pFour">p4</property>
+	</component>
+
+	<component name="CComponent3">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.CServiceImpl3" />
+			<reference name="bOne" target="BComponent"/>
+			<property name="pTwo">p2</property>
+			<property name="pThree">3</property>
+			<property name="pFour">p4</property>
+	</component>
+
+	<component name="CComponent4">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.CServiceImpl4" />
+			<reference name="bOne" target="BComponent"/>
+			<property name="pTwo">p2</property>
+			<property name="pThree">3</property>
+			<property name="pFour">p4</property>
+	</component>
+
+	<component name="CComponent5">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.CServiceImpl5" />
+			<reference name="bOne" target="BComponent"/>
+			<property name="pTwo">p2</property>
+			<property name="pThree">3</property>
+			<property name="pFour">p4</property>
+	</component>
+	
+	<component name="CComponent6">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.CServiceImpl6" />
+			<reference name="bOne" target="BComponent"/>
+			<property name="pTwo">p2</property>
+			<property name="pThree">3</property>
+			<property name="pFour">p4</property>
+	</component>
+	
+    <component name="BComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.BServiceImpl"/>
+    </component>    
+    
+    <component name="AnotherAComponent">
+        <implementation.java
+            class="org.apache.tuscany.sca.vtest.javaapi.annotations.property.impl.AnotherAServiceImpl" />
+            <property name="p13">p13</property>
+            <property name="p14">p14</property>
+            <property name="p22">p22</property>
+            <property name="p23">p23</property>
+            <property name="p24">p24</property>
+            <property name="p25">p25</property>
+    </component>
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
new file mode 100644
index 0000000000..d5fbc568f7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
@@ -0,0 +1,299 @@
+/*
+ * 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.property;
+
+import static org.junit.Assert.fail;
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * This test class tests the Property annotation described in section 1.2.3
+ * including 1.8.5 and 1.8.13
+ */
+public class PropertyAnnotationTestCase {
+
+    protected static String compositeName = "property.composite";
+    protected static AService aService = null;
+    protected static CService cService1 = null;
+    protected static CService cService2 = null;
+    protected static CService cService3 = null;
+    protected static CService cService4 = null;
+    protected static CService cService5 = null;
+    protected static CService cService6 = null;
+    protected static AnotherAService anotherAService = null;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        try {
+            System.out.println("Setting up");
+            ServiceFinder.init(compositeName);
+            aService = ServiceFinder.getService(AService.class, "AComponent");
+            cService1 = ServiceFinder.getService(CService.class, "CComponent1");
+            cService2 = ServiceFinder.getService(CService.class, "CComponent2");
+            cService3 = ServiceFinder.getService(CService.class, "CComponent3");
+            cService4 = ServiceFinder.getService(CService.class, "CComponent4");
+            cService5 = ServiceFinder.getService(CService.class, "CComponent5");
+            cService6 = ServiceFinder.getService(CService.class, "CComponent6");
+            anotherAService = ServiceFinder.getService(AnotherAService.class, "AnotherAComponent");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void destroy() throws Exception {
+
+        System.out.println("Cleaning up");
+        ServiceFinder.cleanup();
+
+    }
+
+    /**
+     * Lines 1343 to 1348:<br>
+     * The "@Property" annotation type is used to annotate a Java class field or
+     * a setter method that is used to inject an SCA property value. The type of
+     * the property injected, which can be a simple Java type or a complex Java
+     * type, is defined by the type of the Java class field or the type of the
+     * setter method input argument.<br>
+     * The "@Property" annotation may be used on protected or public fields and
+     * on setter methods or on a constructor method.<br>
+     * <p>
+     * p1 - simple Java type injected via field<br>
+     * p2 - simple Java type injected via field<br>
+     * p3 - simple Java type injected via setter<br>
+     * p4 - simple Java type injected via setter and required=true<br>
+     * p5 - simple Java type injected via constructor parameter<br>
+     * p6 - simple Java type injected via constructor parameter<br>
+     * p7 - complex Java type injected via field and required=true<br>
+     * p8 - complex Java type injected via field<br>
+     * p9 - complex Java type injected via setter<br>
+     * p10 - complex Java type injected via setter<br>
+     * p11 - complex Java type injected via constructor parameter<br>
+     * p12 - complex Java type injected via constructor parameter<br>
+     */
+    @Test
+    public void atProperty1() throws Exception {
+        Assert.assertEquals("p1", aService.getP1());
+        Assert.assertEquals("p2", aService.getP2());
+        Assert.assertEquals("p3", aService.getP3());
+        Assert.assertEquals("p4", aService.getP4());
+        Assert.assertEquals("p5", aService.getP5());
+        Assert.assertEquals("p6", aService.getP6());
+        Assert.assertEquals("p7.aString", aService.getP7AString());
+        Assert.assertEquals(7, aService.getP7BInt());
+        Assert.assertEquals("p8.aString", aService.getP8AString());
+        Assert.assertEquals(8, aService.getP8BInt());
+        Assert.assertEquals("p9.aString", aService.getP9AString());
+        Assert.assertEquals(9, aService.getP9BInt());
+        Assert.assertEquals("p10.aString", aService.getP10AString());
+        Assert.assertEquals(10, aService.getP10BInt());
+        Assert.assertEquals("p11.aString", aService.getP11AString());
+        Assert.assertEquals(11, aService.getP11BInt());
+        Assert.assertEquals("p12.aString", aService.getP12AString());
+        Assert.assertEquals(12, aService.getP12BInt());
+    }
+
+    /**
+     * Lines 1349 to 1352:<br>
+     * Properties may also be injected via public setter methods even when the
+     * "@Property" annotation is not present. However, the
+     * 
+     * @Property annotation must be used in order to inject a property onto a
+     *           non-public field. In the case where there is no "@Property"
+     *           annotation, the name of the property is the same as the name of
+     *           the field or setter.<br>
+     *           <p>
+     *           p13 is an un-annotated public field which should be injected
+     *           via field<br>
+     */
+    @Test
+    public void atProperty2() throws Exception {
+        Assert.assertEquals("p13", anotherAService.getP13());
+    }
+
+    /**
+     * Line 1353:<br>
+     * Where there is both a setter method and a field for a property, the
+     * setter method is used.<br>
+     * <p>
+     * p14 is an un-annotated public field, it should be injected via public
+     * setter<br>
+     */
+    @Test
+    public void atProperty3() throws Exception {
+        Assert.assertEquals("p14", anotherAService.getP14());
+        Assert.assertTrue(anotherAService.getP14SetterIsCalled());
+    }
+
+    /**
+     * Lines 1355 to 1357:<br>
+     * The "@Property" annotation has the following attributes:<br>
+     * <li>name (optional) – the name of the property, defaults to the name of
+     * the field of the Java class</li>
+     * <li>required (optional) – specifies whether injection is required,
+     * defaults to false</li>
+     * <p>
+     * p15 - injected via field with different name "pFifteen"<br>
+     * p16 - injected via setter with different name "pSixteen"<br>
+     * p17 - injected via field but not defined in composite<br>
+     * p18 - injected via setter but not defined in composite<br>
+     * 
+     * @TODO - Need to test required=true but not defined in composite (The
+     *       specification does not describe the proper behaviour in this
+     *       situation.)
+     */
+    @Test
+    public void atProperty4() throws Exception {
+        Assert.assertEquals("p15", aService.getP15());
+        Assert.assertEquals("p16", aService.getP16());
+        Assert.assertNull(aService.getP17());
+        Assert.assertNull(aService.getP18());
+    }
+
+    /**
+     * Lines 1369 to 1370:<br>
+     * If the property is defined as an array or as a java.util.Collection, then
+     * the implied component type has a property with a many attribute set to
+     * true.<br>
+     * <p>
+     * p19 - a List and injected via field with no element<br>
+     * p20 - a List and injected via setter<br>
+     * p21 - an array and injected via field<br>
+     */
+    @Test
+    public void atProperty5() throws Exception {
+        Assert.assertEquals(0, aService.getP19Size());
+        Assert.assertEquals(1, aService.getP20Size());
+        Assert.assertEquals("p20", aService.getP20(0));
+        Assert.assertEquals(3, aService.getP21Size());
+        Assert.assertEquals(2, aService.getP21(0));
+        Assert.assertEquals(1, aService.getP21(1));
+        Assert.assertEquals(21, aService.getP21(2));
+    }
+
+    /**
+     * Lines 1141 to 1162:<br>
+     * 1.8.5. "@Constructor"<br>
+     * ...<br>
+     * The "@Constructor" annotation is used to mark a particular constructor to
+     * use when instantiating a Java component implementation.<br>
+     * The "@Constructor" annotation has the following attribute:<br>
+     * <li>value (optional) – identifies the property/reference names that
+     * correspond to each of the constructor arguments. The position in the
+     * array determines which of the arguments are being named.</li>
+     * <p>
+     * cService1 - "@Constructor" without value and constructor arguments<br>
+     * cService2 - "@Constructor" without value but with constructor arguments<br>
+     * cService3 - "@Constructor" with values and constructor arguments<br>
+     * cService4 - "@Constructor" with values and constructor arguments where
+     * value, property and parameter names are same<br>
+     * cService5 - "@Constructor" with switched values and constructor arguments<br>
+     * cService6 - "@Constructor" with wrong values<br>
+     */
+    @Test
+    public void atProperty6() throws Exception {
+        Assert.assertNull(cService1.getB1Name());
+        Assert.assertNull(cService1.getP2());
+        Assert.assertEquals(0, cService1.getP3());
+        Assert.assertNull(cService1.getP4());
+        Assert.assertEquals("NoArgument", cService1.getConstructor());
+
+        Assert.assertEquals("BService", cService2.getB1Name());
+        Assert.assertEquals("p2", cService2.getP2());
+        Assert.assertEquals(3, cService2.getP3());
+        Assert.assertEquals("p4", cService2.getP4());
+        Assert.assertEquals("AllArguments", cService2.getConstructor());
+
+        Assert.assertEquals("BService", cService3.getB1Name());
+        Assert.assertEquals("p2", cService3.getP2());
+        Assert.assertEquals(3, cService3.getP3());
+        Assert.assertEquals("p4", cService3.getP4());
+        Assert.assertEquals("AllArguments", cService3.getConstructor());
+
+        Assert.assertEquals("BService", cService4.getB1Name());
+        Assert.assertEquals("p2", cService4.getP2());
+        Assert.assertEquals(3, cService4.getP3());
+        Assert.assertEquals("p4", cService4.getP4());
+        Assert.assertEquals("AllArguments", cService4.getConstructor());
+
+        Assert.assertEquals("BService", cService5.getB1Name());
+        Assert.assertEquals("p4", cService5.getP2());
+        Assert.assertEquals(3, cService5.getP3());
+        Assert.assertEquals("p2", cService5.getP4());
+        Assert.assertEquals("SwitchedValues", cService5.getConstructor());
+
+        try {
+            System.out.println(cService6.getB1Name());
+            fail("Should have failed to call this service");
+        } catch (Throwable t) {
+        }
+
+    }
+
+    /**
+     * Lines 1349 to 1352:<br>
+     * 1.8.13. "@Property"<br>
+     * ...<br>
+     * Properties may also be injected via public setter methods even when the
+     * "@Property" annotation is not present. However, the "@Property"
+     * annotation must be used in order to inject a property onto a non-public
+     * field. In the case where there is no "@Property" annotation, the name of
+     * the property is the same as the name of the field or setter.
+     * <p>
+     * p22 is unannotated protected field which should not be injected p23 is
+     * un-annotated protected which should not be injected via protected setter<br>
+     */
+    @Test
+    @Ignore("JIRA-2289 - p23 failed")
+    public void atProperty7() throws Exception {
+        Assert.assertNull(anotherAService.getP22());
+        Assert.assertNull(anotherAService.getP23());
+        Assert.assertFalse(anotherAService.getP23SetterIsCalled());
+    }
+
+    /**
+     * Lines 1349 to 1352:<br>
+     * 1.8.13. "@Property"<br>
+     * ...<br>
+     * Properties may also be injected via public setter methods even when the
+     * "@Property" annotation is not present. However, the "@Property"
+     * annotation must be used in order to inject a property onto a non-public
+     * field. In the case where there is no "@Property" annotation, the name of
+     * the property is the same as the name of the field or setter.
+     * <p>
+     * p24 is un-annotated protected field which should be injected via public
+     * setter<br>
+     * p25 is un-annotated private field which should be injected via public
+     * setter<br>
+     */
+    @Test
+    public void atProperty8() throws Exception {
+        Assert.assertEquals("p24", anotherAService.getP24());
+        Assert.assertTrue(anotherAService.getP24SetterIsCalled());
+        Assert.assertEquals("p25", anotherAService.getP25());
+        Assert.assertTrue(anotherAService.getP25SetterIsCalled());
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/pom.xml
new file mode 100644
index 0000000000..974f0ad3aa
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/pom.xml
@@ -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>1.5-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>vtest-java-api-annotations-reference</artifactId>
+    <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - Annotations - @Reference</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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
new file mode 100644
index 0000000000..b28704a3b4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
@@ -0,0 +1,55 @@
+/*
+ * 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.reference;
+
+
+/**
+ * Simple Service that uses another Service
+ */
+public interface AService {
+
+    public String getName();
+    public String getB1Name();
+    public String getB2Name();
+    public String getB3Name();
+    public String getB4Name();
+    public String getB5Name();
+    public String getB6Name();
+    public String getB7Name();
+    public String getB8Name();
+    public String getB9Name();
+    public String getB10Name();
+    public String getB11Name();
+    public String getB12Name();
+    public String getB13Name(int i);
+    public String getB14Name(int i);
+    public String getB15Name(int i);
+    
+    public int getB13Size();
+    public int getB14Size();
+    public int getB15Size();
+    
+    public boolean isB7SetterCalled();
+    public boolean isB16Null();
+    public boolean isB17Null();
+    
+    public boolean isB4Null(); 
+    public boolean isB5Null();
+    public boolean isB6Null();
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
new file mode 100644
index 0000000000..53b376d369
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
@@ -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.annotations.reference;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Service used by another service
+ */
+@Remotable
+public interface BService {
+
+    String getName();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
new file mode 100644
index 0000000000..67299d322d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
@@ -0,0 +1,215 @@
+/*
+ * 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.reference.impl;
+
+import java.util.List;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.reference.AService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.reference.BService;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+@Service(AService.class)
+public class AServiceImpl implements AService {
+
+    @Reference
+    protected BService b1; // field injection
+
+    protected BService b2; // injected via constructor parameter
+
+    protected BService b3; // setter injection
+
+    public BService b4; // field injection (public, un-annotated)
+
+    protected BService b5; // field injection (non-public, un-annotated)
+
+    public BService b6; // setter injection (public, un-annotated)
+
+    @Reference
+    protected BService b7; // setter injection (field and setter annotated)
+
+    @Reference(name="b8", required=false)
+    protected BService bEight; // field injection (different reference and field name)
+
+    protected BService bNine; // setter injection (different reference and field name)
+
+    @Reference(required=false)
+    protected BService b10; // multiplicity="0..1" and required=false
+
+    @Reference(required=false)
+    protected BService b11; // multiplicity="1..1" and required=false
+
+    protected BService b12; // multiplicity="1..1" and required=true at setter
+
+    @Reference(required=false)
+    protected List<BService> b13; // multiplicity="0..n" and required=false
+
+    protected List<BService> b14; // multiplicity="1..n" and required=false at setter
+
+    @Reference(name="b15", required=true)
+    protected BService[] b15s; // multiplicity="1..n" and required=true
+
+	@Reference(required=false)
+    protected BService b16;
+
+	@Reference(required=false)
+    public BService b17;
+	
+    protected boolean b7SetterCalled;
+
+    public AServiceImpl(@Reference(name = "b2")
+    BService b2) {
+        super();
+        this.b2 = b2;
+        b7SetterCalled = false;
+    }
+
+    @Reference
+    public void setB3(BService b3) {
+        this.b3 = b3;
+    }
+
+    public void setB6(BService b6) {
+        this.b6 = b6;
+    }
+
+    @Reference
+    public void setB7(BService b7) {
+        b7SetterCalled = true;
+        this.b7 = b7;
+    }
+
+    @Reference(name="b9", required=false)
+    public void setB9(BService bNine) {
+        this.bNine = bNine;
+    }
+    
+    @Reference(required=true)
+    public void setB12(BService b12) {
+        this.b12 = b12;
+    }
+    
+    @Reference(required=true)
+    public void setB14(List<BService> b14) {
+        this.b14 = b14;
+    }
+    
+    public String getName() {
+        return "AService";
+    }
+
+    public String getB1Name() {
+        return b1.getName();
+    }
+
+    public String getB2Name() {
+        return b2.getName();
+    }
+
+    public String getB3Name() {
+        return b3.getName();
+    }
+
+    public String getB4Name() {
+        return b4.getName();
+    }
+
+    public String getB5Name() {
+        return b5.getName();
+    }
+
+    public String getB6Name() {
+        return b6.getName();
+    }
+
+    public String getB7Name() {
+        return b7.getName();
+    }
+
+    public String getB8Name() {
+        return bEight.getName();
+    }
+    
+    public String getB9Name() {
+        return bNine.getName();
+    }
+    
+    public String getB10Name() {
+        return b10.getName();
+    }
+
+    public String getB11Name() {
+        return b11.getName();
+    }
+    
+    public String getB12Name() {
+        return b12.getName();
+    }
+    
+    public String getB13Name(int i) {
+    	BService b = (BService) b13.get(i);
+        return b.getName();
+    }
+    
+    public String getB14Name(int i) {
+    	BService b = (BService) b14.get(i);
+        return b.getName();
+    }
+    
+    public String getB15Name(int i) {
+        return b15s[i].getName();
+    }
+    
+    public int getB13Size() {
+    	return b13.size();
+    }
+    
+    public int getB14Size() {
+    	return b14.size();
+    }
+    
+    public int getB15Size() {
+    	return b15s.length;
+    }
+    
+    public boolean isB7SetterCalled() {
+        return b7SetterCalled;
+    }
+    
+    public boolean isB16Null() {
+        return b16 == null;
+    }
+
+    public boolean isB17Null() {
+        return b17 == null;
+    }
+
+    public boolean isB4Null() {
+        return b4 == null;
+    }
+    
+    public boolean isB5Null() {
+        return b5 == null;
+    }
+    
+    public boolean isB6Null() {
+        return b6 == null;
+    }    
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
new file mode 100644
index 0000000000..a819dfd87d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
@@ -0,0 +1,141 @@
+/*
+ * 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.reference.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.reference.AService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.reference.BService;
+import org.osoa.sca.annotations.Service;
+
+@Service(AService.class)
+public class AUnannotatedServiceImpl implements AService {
+
+    public BService b4; // field injection (public, un-annotated)
+
+    protected BService b5; // field injection (non-public, un-annotated)
+    
+    public BService b6; // setter injection (public, un-annotated)
+
+    public AUnannotatedServiceImpl() {
+    }
+
+    public String getName() {
+        return "AService";
+    }
+
+    public String getB4Name() {
+        return b4.getName();
+    }
+
+    public String getB5Name() {
+        return b5.getName();
+    }
+
+    public void setB6(BService b6) {
+        this.b6 = b6;
+    }
+
+    public String getB6Name() {
+        return b6.getName();
+    }
+
+    public String getB1Name() {
+        return null;
+    }
+
+    public String getB2Name() {
+        return null;
+    }
+
+    public String getB3Name() {
+        return null;
+    }
+
+    public String getB7Name() {
+        return null;
+    }
+
+    public String getB8Name() {
+        return null;
+    }
+
+    public String getB9Name() {
+        return null;
+    }
+
+    public boolean isB7SetterCalled() {
+        return false;
+    }
+
+    public String getB10Name() {
+        return null;
+    }
+
+    public String getB11Name() {
+        return null;
+    }
+
+    public String getB12Name() {
+        return null;
+    }
+
+    public String getB13Name(int i) {
+        return null;
+    }
+
+    public int getB13Size() {
+        return 0;
+    }
+
+    public String getB14Name(int i) {
+        return null;
+    }
+
+    public int getB14Size() {
+        return 0;
+    }
+
+    public String getB15Name(int i) {
+        return null;
+    }
+
+    public int getB15Size() {
+        return 0;
+    }
+    
+    public boolean isB16Null() {
+        return true;
+    }
+
+    public boolean isB17Null() {
+        return true;
+    }
+    
+    public boolean isB4Null() {
+        return b4 == null;
+    }
+    
+    public boolean isB5Null() {
+        return b5 == null;
+    }
+    
+    public boolean isB6Null() {
+        return b6 == null;
+    }     
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
new file mode 100644
index 0000000000..e8611d510f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
@@ -0,0 +1,32 @@
+/*
+ * 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.reference.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.reference.BService;
+import org.osoa.sca.annotations.Service;
+
+@Service(BService.class)
+public class BServiceImpl implements BService {
+
+    public String getName() {
+        return "BService";
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/resources/ab.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/resources/ab.composite
new file mode 100644
index 0000000000..b4ad1e77d5
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/resources/ab.composite
@@ -0,0 +1,51 @@
+<?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="AB-Composite">
+ 	      
+    <component name="AComponent">
+	    <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.reference.impl.AServiceImpl"/>
+        <reference name="b1" target="BComponent"/>		
+        <reference name="b2" target="BComponent"/>		
+        <reference name="b3" target="BComponent"/>
+        <reference name="b7" target="BComponent"/>
+        <reference name="b8" target="BComponent"/>
+        <reference name="b9" target="BComponent"/>
+        <reference name="b10" multiplicity="0..1" target="BComponent"/>
+        <reference name="b11" multiplicity="1..1" target="BComponent"/>
+        <reference name="b12" multiplicity="1..1" target="BComponent"/>
+        <reference name="b13" multiplicity="0..n" target=""/>
+        <reference name="b14" multiplicity="1..n" target="BComponent"/>
+        <reference name="b15" multiplicity="1..n" target="BComponent BComponent"/>
+    </component>   
+    
+    <component name="AUnannotatedComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.reference.impl.AUnannotatedServiceImpl"/>
+        <reference name="b4" target="BComponent"/>
+        <reference name="b5" target="BComponent"/>
+        <reference name="b6" target="BComponent"/>
+     </component>   
+
+    <component name="BComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.reference.impl.BServiceImpl"/>
+    </component>     
+    
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
new file mode 100644
index 0000000000..1fe50b4ea7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
@@ -0,0 +1,229 @@
+/*
+ * 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.reference;
+
+import static org.junit.Assert.fail;
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * This test class tests the "@Reference" annotation described in section 1.8.14
+ */
+public class ReferenceAnnotationTestCase {
+
+    protected static String compositeName = "ab.composite";
+    protected static AService a;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        try {
+            System.out.println("Setting up");
+            ServiceFinder.init(compositeName);
+            a = ServiceFinder.getService(AService.class, "AComponent");
+
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void destroy() throws Exception {
+
+        System.out.println("Cleaning up");
+        ServiceFinder.cleanup();
+    }
+
+    /**
+     * Temporary test unrelated to spec test effort. Remove after resolution of
+     */
+    @Test
+    @Ignore
+    // JIRA T-2145
+    public void bogusComponentName() throws Exception {
+        ServiceFinder.init(compositeName);
+        try {
+            AService a = ServiceFinder.getService(AService.class, "AReallyBogusComponentName");
+            if (a == null)
+                fail("Should have thrown an exception rather than return null");
+            else
+                fail("Should have thrown an exception rather than return a proxy");
+        } finally {
+            ServiceFinder.cleanup();
+        }
+
+    }
+
+    /**
+     * Lines 1404, 1405, 1406 <br>
+     * The "@Reference" annotation type is used to annotate a Java class field
+     * or a setter method that is used to inject a service that resolves the
+     * reference. The interface of the service injected is defined by the type
+     * of the Java class field or the type of the setter method input argument.
+     * <p>
+     * This tests the use of the three usages of the "@Reference" annotation<br>
+     * B1 is injected via field injection <br>
+     * B2 is injected via constructor parameter <br>
+     * B3 is injected via setter method
+     */
+    @Test
+    public void atReference1() throws Exception {
+
+        Assert.assertEquals("BService", a.getB1Name());
+        Assert.assertEquals("BService", a.getB2Name());
+        Assert.assertEquals("BService", a.getB3Name());
+
+    }
+
+    /**
+     * Lines 1407, 1408, 1409, 1410 <br>
+     * References may also be injected via public setter methods even when the
+     * "@Reference" annotation is not present. However, the "@Reference"
+     * annotation must be used in order to inject a reference onto a non public
+     * field. In the case where there is no "@Reference" annotation, the name of
+     * the reference is the same as the name of the field or setter.
+     * <p>
+     * B4 is injected via field injection. Public, Non-annotated <br>
+     * B5 is expected to fail field injection. Non-Public, Non-Annotated <br>
+     * B6 is injected via setter injection. Public, Non-Annotated
+     */
+    @Test
+    public void atReference2() throws Exception {
+        AService anotherA = ServiceFinder.getService(AService.class, "AUnannotatedComponent");
+        
+        Assert.assertFalse(anotherA.isB4Null());
+        Assert.assertTrue(anotherA.isB5Null());
+        Assert.assertFalse(anotherA.isB6Null());
+        
+        Assert.assertEquals("BService", anotherA.getB4Name());
+        try {
+            anotherA.getB5Name();
+            fail("getB5Name expected to fail with NPE");
+        } catch (NullPointerException e) {
+        }
+        Assert.assertEquals("BService", anotherA.getB6Name());
+
+    }
+
+    /**
+     * Lines 1411 <br>
+     * Where there is both a setter method and a field for a reference, the
+     * setter method is used.
+     * <p>
+     * B7 has both field and setter annotated. The setter must be called
+     */
+    @Test
+    public void atReference3() throws Exception {
+        Assert.assertTrue(a.isB7SetterCalled());
+    }
+
+    /**
+     * Lines 1413, 1414, 1415 <br>
+     * The "@Reference" annotation has the following attributes: <br> • name
+     * (optional) – the name of the reference, defaults to the name of the field
+     * of the Java class <br>
+     * required (optional) – whether injection of service or services is
+     * required. Defaults to true.
+     * <p>
+     * Reference and field have different names<br>
+     * B8 is field injected<br>
+     * B9 is setter injected
+     */
+    @Test
+    public void atReference4() throws Exception {
+        Assert.assertEquals("BService", a.getB8Name());
+        Assert.assertEquals("BService", a.getB9Name());
+    }
+
+    /**
+     * Lines 1457 to 1459<br>
+     * If the reference is not an array or collection, then the implied
+     * component type has a reference with a multiplicity of either 0..1 or 1..1
+     * depending on the value of the
+     * 
+     * @Reference required attribute – 1..1 applies if required=true.<br>
+     *            <p>
+     *            B10 is field injected, required=false, and multiplicity="0..1"<br>
+     *            B11 is field injected, required=false, and multiplicity="1..1"<br>
+     *            B12 is setter injected, required=true, and multiplicity="1..1"
+     */
+    @Test
+    public void atReference5() throws Exception {
+        Assert.assertEquals("BService", a.getB10Name());
+        Assert.assertEquals("BService", a.getB11Name());
+        Assert.assertEquals("BService", a.getB12Name());
+    }
+
+    /**
+     * Lines 1461 to 1463<br>
+     * If the reference is defined as an array or as a java.util.Collection,
+     * then the implied component type has a reference with a multiplicity of
+     * either 1..n or 0..n, depending on whether the required attribute of the
+     * "@Reference" annotation is set to true or false – 1..n applies if
+     * required=true.<br>
+     * <p>
+     * B13 is a java.util.List, field injected, required=false,
+     * multiplicity="0..n", and no target<br>
+     * B14 is a java.util.List, setter injected, required=true,
+     * multiplicity="1..n", and one target<br>
+     * B15 is an array, field injected, required=true, multiplicity="1..n", and
+     * two targets
+     */
+    @Test
+    public void atReference6() throws Exception {
+        Assert.assertEquals(0, a.getB13Size());
+        Assert.assertEquals("BService", a.getB14Name(0));
+        Assert.assertEquals(1, a.getB14Size());
+        Assert.assertEquals("BService", a.getB15Name(0));
+        Assert.assertEquals("BService", a.getB15Name(1));
+        Assert.assertEquals(2, a.getB15Size());
+    }
+
+    /**
+     * Lines 1415 <br>
+     * required (optional) - whether injection of service or services is
+     * required. Defaults to true.
+     * <p>
+     * b16 and b17 is defined as "@Reference(required=false)" and AComponent
+     * does not define reference for them
+     */
+    @Test
+    public void atReference7() throws Exception {
+        Assert.assertTrue(a.isB16Null());
+        Assert.assertTrue(a.isB17Null());
+    }
+    
+    /**
+     * Java Component Implementation Spec
+     * Section 1.2.7
+     * Line 361 when @Property and @Reference annotations are present
+     * then unannotated fields are ignored
+     */
+    @Test
+    public void atReference8() throws Exception {
+        Assert.assertTrue(a.isB4Null());
+        Assert.assertTrue(a.isB5Null());
+        Assert.assertTrue(a.isB6Null());
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/pom.xml
new file mode 100644
index 0000000000..f1eb49eba8
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/pom.xml
@@ -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>1.5-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>vtest-java-api-annotations-scope</artifactId>
+    <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - Annotations - @Scope</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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
new file mode 100644
index 0000000000..b7cf3fba71
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
@@ -0,0 +1,29 @@
+/*
+ * 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.scope;
+
+
+/**
+ * Simple Service
+ */
+public interface AService {
+
+    public String getName();
+    
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
new file mode 100644
index 0000000000..7da9d29424
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
@@ -0,0 +1,40 @@
+/*
+ * 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.scope;
+
+/**
+ * Simple Service
+ */
+public interface BService {
+
+    public String getName();
+    
+    public boolean isInitReady();
+    
+    public String getCurrentState();
+    
+    public String setCurrentState(String currentState);
+    
+	public int getDestroyCalledCounter();
+
+	public int getInitCalledCounter();
+
+	public int getInstanceCounter();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
new file mode 100644
index 0000000000..208c6a78b0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
@@ -0,0 +1,40 @@
+/*
+ * 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.scope;
+
+/**
+ * Simple Service
+ */
+public interface CService {
+
+    public String getName();
+    
+    public boolean isInitReady();
+    
+    public String getCurrentState();
+    
+    public String setCurrentState(String currentState);
+    
+	public int getDestroyCalledCounter();
+
+	public int getInitCalledCounter();
+
+	public int getInstanceCounter();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
new file mode 100644
index 0000000000..d4cedcc979
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
@@ -0,0 +1,43 @@
+/*
+ * 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.scope;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Service
+ */
+@Remotable
+public interface DService {
+
+    public String getName();
+    
+    public boolean isInitReady();
+    
+    public String getCurrentState();
+    
+    public String setCurrentState(String currentState);
+    
+	public int getDestroyCalledCounter();
+
+	public int getInitCalledCounter();
+
+	public int getInstanceCounter();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
new file mode 100644
index 0000000000..7844ba7b62
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
@@ -0,0 +1,43 @@
+/*
+ * 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.scope;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Service
+ */
+@Remotable
+public interface FService {
+
+    public String getName();
+    
+    public boolean isInitReady();
+    
+    public String getCurrentState();
+    
+    public String setCurrentState(String currentState);
+    
+	public int getDestroyCalledCounter();
+
+	public int getInitCalledCounter();
+
+	public int getInstanceCounter();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
new file mode 100644
index 0000000000..7a047414dc
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
@@ -0,0 +1,35 @@
+/*
+ * 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.scope;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Service
+ */
+@Remotable
+public interface GService {
+
+    public String getName();
+    
+	public int getInitCalledCounter();
+
+	public int getDestroyCalledCounter();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
new file mode 100644
index 0000000000..555cdd5be0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
@@ -0,0 +1,36 @@
+/*
+ * 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.scope;
+
+import org.osoa.sca.annotations.Remotable;
+
+
+/**
+ * Simple Service
+ */
+@Remotable
+public interface HService {
+
+    public String getName();
+    
+    public String test();
+    
+    public String testCounters(int n);
+    
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
new file mode 100644
index 0000000000..79e20a3879
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
@@ -0,0 +1,48 @@
+/*
+ * 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.scope;
+
+import org.osoa.sca.annotations.Conversational;
+import org.osoa.sca.annotations.EndsConversation;
+
+/**
+ * Simple Service
+ */
+@Conversational
+public interface IService {
+
+    public String getName();
+    
+    public boolean isInitReady();
+    
+    public String getCurrentState();
+    
+    public String getConversationId();
+    
+    public String setCurrentState(String currentState);
+    
+	public int getDestroyCalledCounter();
+
+	public int getInitCalledCounter();
+
+	public int getInstanceCounter();
+
+	@EndsConversation
+    public void endConversation();
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
new file mode 100644
index 0000000000..95813f0e32
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
@@ -0,0 +1,33 @@
+/*
+ * 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.scope;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Service
+ */
+@Remotable
+public interface JService {
+
+    public String getName();
+
+    public String getFailedReason();
+    
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
new file mode 100644
index 0000000000..b4c95965ff
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
@@ -0,0 +1,33 @@
+/*
+ * 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.scope;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Service
+ */
+@Remotable
+public interface KService {
+
+    public String getName();
+
+    public String callL1();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
new file mode 100644
index 0000000000..5c0fc12fa3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.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.annotations.scope;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Service
+ */
+@Remotable
+public interface LService {
+
+    public String getName();
+    
+    public String getCurrentState();
+    
+    public String setCurrentState(String currentState);
+    
+	public int getDestroyCalledCounter();
+
+	public int getInitCalledCounter();
+
+	public int getInstanceCounter();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
new file mode 100644
index 0000000000..ab6a3f946a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
@@ -0,0 +1,33 @@
+/*
+ * 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.scope;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Service
+ */
+@Remotable
+public interface MService {
+
+    public String getName();
+
+    public String getFailedReason();
+    
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
new file mode 100644
index 0000000000..c544bf6e02
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
@@ -0,0 +1,33 @@
+/*
+ * 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.scope;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Service
+ */
+@Remotable
+public interface NService {
+
+    public String getName();
+
+    public String callO1(int nthTime);
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
new file mode 100644
index 0000000000..0104030f2e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.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.annotations.scope;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Service
+ */
+@Remotable
+public interface OService {
+
+    public String getName();
+    
+    public String getCurrentState();
+    
+    public String setCurrentState(String currentState);
+    
+	public int getDestroyCalledCounter();
+
+	public int getInitCalledCounter();
+
+	public int getInstanceCounter();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
new file mode 100644
index 0000000000..9c17b06b16
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
@@ -0,0 +1,32 @@
+/*
+ * 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.scope.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.AService;
+import org.osoa.sca.annotations.Service;
+
+@Service(AService.class)
+public class AServiceImpl implements AService {
+
+	public String getName() {
+        return "AService";
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
new file mode 100644
index 0000000000..2a8bd80e9a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
@@ -0,0 +1,112 @@
+/*
+ * 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.scope.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.AService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.BService;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Destroy;
+
+@Service(BService.class)
+public class BServiceImpl implements BService {
+
+	private static int instanceCounter = 0;
+
+	private static int initCalledCounter = 0;
+
+	private static int destroyCalledCounter = 0;
+
+	public AService a1;
+	
+	public String p1;
+	
+	private int currentInstanceId = 0;
+	
+	public String currentState = null;
+	
+	private boolean isInitReady = false;
+		
+	public BServiceImpl() {
+		currentInstanceId = ++instanceCounter;
+		isInitReady = false;
+	}
+
+	@Reference
+	public void setA1(AService a1) {
+		this.a1 = a1;
+	}
+
+	@Property
+	public void setP1(String p1) {
+		this.p1 = p1;
+	}
+
+	@Init
+    public void initBService() throws Exception {
+    	initCalledCounter++;
+    	if (p1.equals("p1") && a1.getName().equals("AService"))
+    		isInitReady = true;
+    }
+
+    @Destroy
+    public void destroyBService() {
+    	destroyCalledCounter++;
+    }
+    
+    public String getName() {
+        return "BService" + currentInstanceId;
+    }
+    
+    public AService getA1() {
+		return a1;
+	}
+
+    public String getP1() {
+		return p1;
+	}
+
+    public String getCurrentState() {
+		return currentState;
+	}
+
+	public String setCurrentState(String currentState) {
+		this.currentState = currentState;
+		return this.currentState;
+	}
+
+	public boolean isInitReady() {
+		return isInitReady;
+	}
+
+	public int getDestroyCalledCounter() {
+		return destroyCalledCounter;
+	}
+
+	public int getInitCalledCounter() {
+		return initCalledCounter;
+	}
+
+	public int getInstanceCounter() {
+		return instanceCounter;
+	}
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
new file mode 100644
index 0000000000..c99f5f5e74
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
@@ -0,0 +1,114 @@
+/*
+ * 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.scope.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.AService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.CService;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.Scope;
+
+@Service(CService.class)
+@Scope("STATELESS")
+public class CServiceImpl implements CService {
+
+	public static int instanceCounter = 0;
+
+	public static int initCalledCounter = 0;
+
+	public static int destroyCalledCounter = 0;
+
+	public AService a1;
+	
+	public String p1;
+	
+	public int currentInstanceId = 0;
+	
+	public String currentState = null;
+	
+	public boolean isInitReady = false;
+		
+	public CServiceImpl() {
+		currentInstanceId = ++instanceCounter;
+		isInitReady = false;
+	}
+
+	@Reference
+	public void setA1(AService a1) {
+		this.a1 = a1;
+	}
+
+	@Property
+	public void setP1(String p1) {
+		this.p1 = p1;
+	}
+
+	@Init
+    public void initCService() throws Exception {
+    	initCalledCounter++;
+    	if (p1.equals("p1") && a1.getName().equals("AService"))
+    		isInitReady = true;
+    }
+
+    @Destroy
+    public void destroyCService() {
+    	destroyCalledCounter++;
+    }
+    
+    public String getName() {
+        return "CService" + currentInstanceId;
+    }
+    
+    public AService getA1() {
+		return a1;
+	}
+
+    public String getP1() {
+		return p1;
+	}
+
+    public String getCurrentState() {
+		return currentState;
+	}
+
+	public String setCurrentState(String currentState) {
+		this.currentState = currentState;
+		return this.currentState;
+	}
+
+	public boolean isInitReady() {
+		return isInitReady;
+	}
+
+	public int getDestroyCalledCounter() {
+		return destroyCalledCounter;
+	}
+
+	public int getInitCalledCounter() {
+		return initCalledCounter;
+	}
+
+	public int getInstanceCounter() {
+		return instanceCounter;
+	}
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
new file mode 100644
index 0000000000..cc41994106
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
@@ -0,0 +1,116 @@
+/*
+ * 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.scope.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.AService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.DService;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.Scope;
+
+@Service(DService.class)
+@Scope("REQUEST")
+public class DServiceImpl implements DService {
+
+	public static int instanceCounter = 0;
+
+	public static int initCalledCounter = 0;
+
+	public static int destroyCalledCounter = 0;
+
+	public AService a1;
+	
+	public String p1;
+	
+	public int currentInstanceId = 0;
+	
+	public String currentState = null;
+	
+	public boolean isInitReady = false;
+	
+	public DServiceImpl() {
+		currentInstanceId = ++instanceCounter;
+		isInitReady = false;
+	}
+
+	@Reference
+	public void setA1(AService a1) {
+		this.a1 = a1;
+	}
+
+	@Property
+	public void setP1(String p1) {
+		this.p1 = p1;
+	}
+
+	@Init
+    public void initDService() throws Exception {
+    	initCalledCounter++;
+    	if (p1.equals("p1") && a1.getName().equals("AService"))
+    		isInitReady = true;
+    	System.out.println("DService" + currentInstanceId + "->initDService");
+    }
+
+    @Destroy
+    public void destroyDService() {
+    	destroyCalledCounter++;
+    	System.out.println("DService" + currentInstanceId + "->destroyDService");
+    }
+    
+    public String getName() {
+        return "DService" + currentInstanceId;
+    }
+    
+    public AService getA1() {
+		return a1;
+	}
+
+    public String getP1() {
+		return p1;
+	}
+
+    public String getCurrentState() {
+		return currentState;
+	}
+
+	public String setCurrentState(String currentState) {
+		this.currentState = "DService" + currentInstanceId + "-" + currentState;
+		return this.currentState;
+	}
+
+	public boolean isInitReady() {
+		return isInitReady;
+	}
+
+	public int getDestroyCalledCounter() {
+		return destroyCalledCounter;
+	}
+
+	public int getInitCalledCounter() {
+		return initCalledCounter;
+	}
+
+	public int getInstanceCounter() {
+		return instanceCounter;
+	}
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
new file mode 100644
index 0000000000..4fb7386484
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
@@ -0,0 +1,116 @@
+/*
+ * 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.scope.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.AService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.FService;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.Scope;
+
+@Service(FService.class)
+@Scope("COMPOSITE")
+public class FServiceImpl implements FService {
+
+	public static int instanceCounter = 0;
+
+	public static int initCalledCounter = 0;
+
+	public static int destroyCalledCounter = 0;
+
+	public AService a1;
+	
+	public String p1;
+	
+	public int currentInstanceId = 0;
+	
+	public String currentState = null;
+	
+	public boolean isInitReady = false;
+	
+	public FServiceImpl() {
+		currentInstanceId = ++instanceCounter;
+		isInitReady = false;
+	}
+
+	@Reference
+	public void setA1(AService a1) {
+		this.a1 = a1;
+	}
+
+	@Property
+	public void setP1(String p1) {
+		this.p1 = p1;
+	}
+	
+	@Init
+    public void initFService() throws Exception {
+    	initCalledCounter++;
+    	if (p1.equals("p1") && a1.getName().equals("AService"))
+    		isInitReady = true;
+    	System.out.println("FService" + currentInstanceId + "->initFService");
+    }
+
+    @Destroy
+    public void destroyFService() {
+    	destroyCalledCounter++;
+    	System.out.println("FService" + currentInstanceId + "->destroyFService");
+    }
+    
+    public String getName() {
+        return "FService" + currentInstanceId;
+    }
+    
+    public AService getA1() {
+		return a1;
+	}
+
+    public String getP1() {
+		return p1;
+	}
+
+    public String getCurrentState() {
+		return currentState;
+	}
+
+	public String setCurrentState(String currentState) {
+		this.currentState = "FService" + currentInstanceId + "-" + currentState;
+		return this.currentState;
+	}
+
+	public boolean isInitReady() {
+		return isInitReady;
+	}
+
+	public int getDestroyCalledCounter() {
+		return destroyCalledCounter;
+	}
+
+	public int getInitCalledCounter() {
+		return initCalledCounter;
+	}
+
+	public int getInstanceCounter() {
+		return instanceCounter;
+	}
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
new file mode 100644
index 0000000000..994469cb3a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
@@ -0,0 +1,75 @@
+/*
+ * 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.scope.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.AService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.GService;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.EagerInit;
+
+@Scope("COMPOSITE")
+@EagerInit
+public class GServiceImpl implements GService {
+
+	public static int initCalledCounter = 0;
+
+	public static int destroyCalledCounter = 0;
+	
+	public AService a1;
+	
+	public String p1;
+	
+	@Init
+    public void initGService() throws Exception {
+    	initCalledCounter++;
+    	System.out.println("GService->initGService");
+    }
+
+    @Destroy
+    public void destroyGService() {
+    	destroyCalledCounter++;
+    	System.out.println("GService->destroyGService");
+    }
+    
+	@Reference
+	public void setA1(AService a1) {
+		this.a1 = a1;
+	}
+
+	@Property
+	public void setP1(String p1) {
+		this.p1 = p1;
+	}
+	
+    public String getName() {
+        return "GService";
+    }
+    
+	public int getInitCalledCounter() {
+		return initCalledCounter;
+	}
+
+	public int getDestroyCalledCounter() {
+		return destroyCalledCounter;
+	}
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
new file mode 100644
index 0000000000..2fa610def7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
@@ -0,0 +1,86 @@
+/*
+ * 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.scope.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.IService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.HService;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+@Service(HService.class)
+public class HServiceImpl implements HService {
+
+	@Reference
+	public IService i1;
+	
+	public String getName() {
+        return "HService";
+    }
+
+	public String test() {
+
+		String serviceName = i1.getName();
+		String conversationIdBefore = i1.getConversationId();
+			
+		for (int i = 0; i < 10; i++) {
+			String newState = "state-" + i;
+			i1.setCurrentState(newState);
+			String currentState = i1.getCurrentState();
+			if (currentState == null || !currentState.equals(serviceName + "-" + newState)) {
+				i1.endConversation();
+				return "CurrentStateLost - " + currentState;
+			}
+		}
+
+		boolean isInitReady = i1.isInitReady();
+
+		String conversationIdAfter = i1.getConversationId();
+
+		i1.endConversation();
+
+		if (!isInitReady)
+			return "InitNotReady";
+
+		if (!conversationIdBefore.equals(conversationIdAfter))
+			return "DifferentConversationId";
+		
+		return "None";
+	}
+
+	public String testCounters(int n) {
+		int instanceCounter = i1.getInstanceCounter();
+		int initCalledCounter = i1.getInitCalledCounter();
+		int destroyCalledCounter = i1.getDestroyCalledCounter();
+		
+        System.out.println("instanceCounter=" + instanceCounter);
+        System.out.println("initCalledCounter=" + initCalledCounter);
+        System.out.println("destroyCalledCounter=" + destroyCalledCounter);
+
+		if (instanceCounter != n + 1) 
+			return "IncorrectInstanceCounter";
+		if (initCalledCounter != n + 1)
+			return "IncorrectInitCalledCounter";
+		if (destroyCalledCounter != n)
+			return "IncorrectDestroyCalledCounter";
+		
+		return "None";
+	}
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
new file mode 100644
index 0000000000..12566dc5e4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
@@ -0,0 +1,131 @@
+/*
+ * 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.scope.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.AService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.IService;
+import org.osoa.sca.annotations.ConversationID;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.Scope;
+
+@Service(IService.class)
+@Scope("CONVERSATION")
+public class IServiceImpl implements IService {
+
+	public static int instanceCounter = 0;
+
+	public static int initCalledCounter = 0;
+
+	public static int destroyCalledCounter = 0;
+
+    @ConversationID
+    protected String conversationId;
+    
+	public int currentInstanceId = 0;
+    
+	public AService a1;
+	
+	public String p1;
+	
+	public String currentState = null;
+	
+	public boolean isInitReady = false;
+	
+	public IServiceImpl() {
+		synchronized (IServiceImpl.class) {
+			currentInstanceId = ++instanceCounter;
+		}
+		isInitReady = false;
+	}
+
+	@Reference
+	public void setA1(AService a1) {
+		this.a1 = a1;
+	}
+
+	@Property
+	public void setP1(String p1) {
+		this.p1 = p1;
+	}
+
+	@Init
+    public void initIService() throws Exception {
+    	initCalledCounter++;
+    	if (p1.equals("p1") && a1.getName().equals("AService"))
+    		isInitReady = true;
+    	System.out.println("IService" + currentInstanceId + "->initIService");
+    }
+
+    @Destroy
+    public void destroyIService() {
+    	destroyCalledCounter++;
+    	System.out.println("IService" + currentInstanceId + "->destroyIService");
+    }
+    
+    public void endConversation() {
+    	System.out.println("IService" + currentInstanceId + "->endConversation");
+    }
+    
+    public String getName() {
+        return "IService" + currentInstanceId;
+    }
+    
+    public AService getA1() {
+		return a1;
+	}
+
+    public String getP1() {
+		return p1;
+	}
+
+    public String getCurrentState() {
+		return currentState;
+	}
+
+	public String getConversationId() {
+		return conversationId;
+	}
+
+	public String setCurrentState(String currentState) {
+		this.currentState = "IService" + currentInstanceId + "-" + currentState;
+		return this.currentState;
+	}
+
+	public boolean isInitReady() {
+		return isInitReady;
+	}
+
+	public int getDestroyCalledCounter() {
+		return destroyCalledCounter;
+	}
+
+	public int getInitCalledCounter() {
+		return initCalledCounter;
+	}
+
+	public int getInstanceCounter() {
+		return instanceCounter;
+	}
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
new file mode 100644
index 0000000000..a5851598a0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
@@ -0,0 +1,78 @@
+/*
+ * 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.scope.impl;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.KService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.JService;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.Scope;
+
+@Service(JService.class)
+@Scope("COMPOSITE")
+public class JServiceImpl implements JService {
+
+	@Reference
+	public KService k1;
+	
+	public static String failedReason = "";
+	
+	public static Timer aTimer = null;
+
+	@Init
+    public void initJService() throws Exception {
+    	aTimer = new Timer();
+    	aTimer.schedule(new JTimerTask(), 1000);
+    	System.out.println("JService->initJService");
+    }
+
+    @Destroy
+    public void destroyJService() {
+    	aTimer.cancel();
+    	System.out.println("JService->destroyJService");
+    }
+    
+    public String getName() {
+        return "JService";
+    }
+    
+    public String getFailedReason() {
+        return failedReason;
+    }
+    
+	private class JTimerTask extends TimerTask {
+
+		public boolean cancel() {
+			return true;
+		}
+		
+		public void run() {
+			String result = k1.callL1();
+			if (!result.equals("None"))
+				failedReason = failedReason + ";" + result;
+		}
+		
+	}
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
new file mode 100644
index 0000000000..7088562c57
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
@@ -0,0 +1,80 @@
+/*
+ * 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.scope.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.KService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.LService;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.Scope;
+
+@Service(KService.class)
+@Scope("STATELESS")
+public class KServiceImpl implements KService {
+
+	public static int instanceCounter = 0;
+
+	public String previousL1Name = null;
+
+	public int currentInstanceId = 0;
+
+	@Reference
+	public LService l1;
+	
+	public KServiceImpl() {
+		currentInstanceId = ++instanceCounter;
+	}
+
+	
+    public String getName() {
+        return "KService"+currentInstanceId;
+    }
+    
+    public String callL1() {
+
+    	for (int i = 1; i < 11; i++) {
+    		System.out.println(getName() + " calls LService " + i + (i == 1 ? "st time:" : (i == 2 ? "nd time:" : (i == 3 ? "rd time:" : "th time"))));
+
+    		String serviceName = l1.getName();
+    		for (int j = 0; j < 10; j++) {
+    			String newState = "state-" + j;
+    			l1.setCurrentState(newState);
+    			String currentState = l1.getCurrentState();
+    			if (!currentState.equals(serviceName + "-" + newState)) {
+    				return "CurrentStateLost - " + currentState;
+    			}
+        	}
+
+    		System.out.print("    Name=" + serviceName);
+    		System.out.print(", #Instance=" + l1.getInstanceCounter());
+    		System.out.print(", #InitCalled=" + l1.getInitCalledCounter());
+    		System.out.println(", #DestroyCalled=" + l1.getDestroyCalledCounter());
+
+        	if (previousL1Name == null) {
+        		previousL1Name = serviceName;
+        	} else {
+        		if (!previousL1Name.equals(serviceName))
+        			return "DifferentLServiceInstance";
+        	}
+        }
+		return "None";
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
new file mode 100644
index 0000000000..274e0570d9
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
@@ -0,0 +1,83 @@
+/*
+ * 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.scope.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.LService;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.Scope;
+
+@Service(LService.class)
+@Scope("REQUEST")
+public class LServiceImpl implements LService {
+
+	public static int instanceCounter = 0;
+
+	public static int initCalledCounter = 0;
+
+	public static int destroyCalledCounter = 0;
+
+	public int currentInstanceId = 0;
+	
+	public String currentState = null;
+	
+	public LServiceImpl() {
+		currentInstanceId = ++instanceCounter;
+	}
+
+	@Init
+    public void initLService() throws Exception {
+    	initCalledCounter++;
+    	System.out.println("LService" + currentInstanceId + "->initLService");
+    }
+
+    @Destroy
+    public void destroyLService() {
+    	destroyCalledCounter++;
+    	System.out.println("LService" + currentInstanceId + "->destroyLService");
+    }
+    
+    public String getName() {
+        return "LService" + currentInstanceId;
+    }
+    
+    public String getCurrentState() {
+		return currentState;
+	}
+
+	public String setCurrentState(String currentState) {
+		this.currentState = "LService" + currentInstanceId + "-" + currentState;
+		return this.currentState;
+	}
+
+	public int getDestroyCalledCounter() {
+		return destroyCalledCounter;
+	}
+
+	public int getInitCalledCounter() {
+		return initCalledCounter;
+	}
+
+	public int getInstanceCounter() {
+		return instanceCounter;
+	}
+	
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
new file mode 100644
index 0000000000..681b0b3776
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
@@ -0,0 +1,81 @@
+/*
+ * 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.scope.impl;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.MService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.NService;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.Scope;
+
+@Service(MService.class)
+@Scope("COMPOSITE")
+public class MServiceImpl implements MService {
+
+	@Reference
+	public NService n1;
+	
+	public static String failedReason = "";
+	
+	public static Timer aTimer = null;
+
+	public static int counter = 0;
+
+	@Init
+    public void initMService() throws Exception {
+    	aTimer = new Timer();
+    	aTimer.schedule(new MTimerTask(), 1000, 1000);
+    	System.out.println("MService->initMService");
+    }
+
+    @Destroy
+    public void destroyMService() {
+    	aTimer.cancel();
+    	System.out.println("MService->destroyMService");
+    }
+    
+    public String getName() {
+        return "MService";
+    }
+    
+    public String getFailedReason() {
+        return failedReason;
+    }
+    
+	private class MTimerTask extends TimerTask {
+
+		public boolean cancel() {
+			return true;
+		}
+		
+		public void run() {
+			counter++;
+			String result = n1.callO1(counter);
+			if (!result.equals("None"))
+				failedReason = failedReason + ";" + result;
+		}
+		
+	}
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
new file mode 100644
index 0000000000..98b94a33c7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
@@ -0,0 +1,85 @@
+/*
+ * 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.scope.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.NService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.OService;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.Scope;
+
+@Service(NService.class)
+@Scope("STATELESS")
+public class NServiceImpl implements NService {
+
+	public static int instanceCounter = 0;
+
+	public String previousL1Name = null;
+
+	public int currentInstanceId = 0;
+
+	@Reference
+	public OService o1;
+	
+	public NServiceImpl() {
+		currentInstanceId = ++instanceCounter;
+	}
+
+	
+    public String getName() {
+        return "NService"+currentInstanceId;
+    }
+    
+    public String callO1(int nthTime) {
+
+    	for (int i = 1; i < 11; i++) {
+    		System.out.println(getName() + " calls OService " + i + (i == 1 ? "st time:" : (i == 2 ? "nd time:" : (i == 3 ? "rd time:" : "th time"))));
+
+    		String serviceName = o1.getName();
+    		for (int j = 0; j < 10; j++) {
+    			String newState = "state-" + j;
+    			o1.setCurrentState(newState);
+    			String currentState = o1.getCurrentState();
+    			if (!currentState.equals(serviceName + "-" + newState)) {
+    				return "CurrentStateLost - " + currentState;
+    			}
+        	}
+
+    		System.out.print("    Name=" + serviceName);
+    		System.out.print(", #Instance=" + o1.getInstanceCounter());
+    		System.out.print(", #InitCalled=" + o1.getInitCalledCounter());
+    		System.out.println(", #DestroyCalled=" + o1.getDestroyCalledCounter());
+
+        	if (previousL1Name == null) {
+        		previousL1Name = serviceName;
+        	} else {
+        		if (!previousL1Name.equals(serviceName))
+        			return "DifferentOServiceInstance";
+        	}
+        	
+        }
+    	
+    	if (o1.getInstanceCounter() < nthTime) {
+    		return "SharedSameInstance";
+    	}
+
+    	return "None";
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
new file mode 100644
index 0000000000..8cf39a072c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
@@ -0,0 +1,83 @@
+/*
+ * 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.scope.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.scope.OService;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.Scope;
+
+@Service(OService.class)
+@Scope("REQUEST")
+public class OServiceImpl implements OService {
+
+	public static int instanceCounter = 0;
+
+	public static int initCalledCounter = 0;
+
+	public static int destroyCalledCounter = 0;
+
+	public int currentInstanceId = 0;
+	
+	public String currentState = null;
+	
+	public OServiceImpl() {
+		currentInstanceId = ++instanceCounter;
+	}
+
+	@Init
+    public void initOService() throws Exception {
+    	initCalledCounter++;
+    	System.out.println("OService" + currentInstanceId + "->initOService");
+    }
+
+    @Destroy
+    public void destroyOService() {
+    	destroyCalledCounter++;
+    	System.out.println("OService" + currentInstanceId + "->destroyOService");
+    }
+    
+    public String getName() {
+        return "OService" + currentInstanceId;
+    }
+    
+    public String getCurrentState() {
+		return currentState;
+	}
+
+	public String setCurrentState(String currentState) {
+		this.currentState = "OService" + currentInstanceId + "-" + currentState;
+		return this.currentState;
+	}
+
+	public int getDestroyCalledCounter() {
+		return destroyCalledCounter;
+	}
+
+	public int getInitCalledCounter() {
+		return initCalledCounter;
+	}
+
+	public int getInstanceCounter() {
+		return instanceCounter;
+	}
+	
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/resources/scope.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/resources/scope.composite
new file mode 100644
index 0000000000..7c195b2b5d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/resources/scope.composite
@@ -0,0 +1,110 @@
+<?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="Scope-Composite">
+
+	<component name="AComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.AServiceImpl" />
+	</component>
+
+	<component name="BComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.BServiceImpl" />
+		<reference name="a1" target="AComponent"/>
+		<property name="p1">p1</property>	
+	</component>
+	
+	<component name="CComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.CServiceImpl" />
+		<reference name="a1" target="AComponent"/>
+		<property name="p1">p1</property>	
+	</component>
+	
+	<component name="DComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.DServiceImpl" />
+		<reference name="a1" target="AComponent"/>
+		<property name="p1">p1</property>	
+	</component>
+	
+	<component name="FComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.FServiceImpl" />
+		<reference name="a1" target="AComponent"/>
+		<property name="p1">p1</property>	
+	</component>
+	
+	<component name="GComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.GServiceImpl" />
+		<reference name="a1" target="AComponent"/>
+		<property name="p1">p1</property>	
+	</component>
+	
+	<component name="HComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.HServiceImpl" />
+		<reference name="i1" target="IComponent"/>
+	</component>
+
+	<component name="IComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.IServiceImpl" />
+		<reference name="a1" target="AComponent"/>
+		<property name="p1">p1</property>	
+	</component>
+	
+	<component name="JComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.JServiceImpl" />
+		<reference name="k1" target="KComponent"/>
+	</component>
+	
+	<component name="KComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.KServiceImpl" />
+		<reference name="l1" target="LComponent"/>
+	</component>
+	
+	<component name="LComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.LServiceImpl" />
+	</component>
+
+	<component name="MComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.MServiceImpl" />
+		<reference name="n1" target="NComponent"/>
+	</component>
+
+	<component name="NComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.NServiceImpl" />
+		<reference name="o1" target="OComponent"/>
+	</component>
+	
+	<component name="OComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.scope.impl.OServiceImpl" />
+	</component>
+	
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
new file mode 100644
index 0000000000..6d65416ce8
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
@@ -0,0 +1,476 @@
+/*
+ * 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.scope;
+
+import java.util.ArrayList;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * This test class tests the Scope annotation described in section 1.2.4
+ * including 1.8.7, 1.8.8, 1.8.9, 1.8.10, 1.8.11, and 1.8.16<br>
+ * <p>
+ * Check following:<br>
+ * <li>Number of service instances be created</li>
+ * <li>Init method be called and where all property and reference injection is
+ *     complete.</li>
+ * <li>Destroy method be called</li>
+ * <li>State be preserved in request and conversation scopes but not others</li>
+ */
+public class ScopeAnnotationTestCase {
+
+    protected static String compositeName = "scope.composite";
+
+    protected static int numDThread = 5;
+    protected static int numFThread = 5;
+    protected static int numHThread = 5;
+	
+    @BeforeClass
+    public static void init() throws Exception {
+        try {
+            System.out.println("Setting up");
+            ServiceFinder.init(compositeName);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void destroy() throws Exception {
+
+        System.out.println("Cleaning up");
+        ServiceFinder.cleanup();
+    }
+    
+    /**
+     * Line 259:<br>
+     * <li>STATELESS</li>
+     * <p>
+     * Line 284:<br>
+     * For stateless components, there is no implied correlation between
+     * service requests.<br>
+     * <p>
+     * Line 1589 to 1591:<br>
+     * The default value is 'STATELESS'. For 'STATELESS' implementations,
+     * a different implementation instance may be used to service each request.
+     * Implementation instances may be newly created or be drawn from a pool
+     * of instances.<br>
+     * <p>
+     * BComponent is not defined '@Scope'<br>
+     * CComponent is defined '@Scope("STATELESS")'<br>
+     * <p>
+     */
+    @Test
+    public void atScope1() throws Exception {
+        System.out.println("atScope1");
+        BThread b1 = new BThread("ThreadB1");
+        BThread b2 = new BThread("ThreadB2");
+        CThread c1 = new CThread("ThreadC1");
+        CThread c2 = new CThread("ThreadC2");
+        
+        b1.start();
+        b2.start();
+        c1.start();
+        c2.start();
+        b1.join();
+        b2.join();
+        c1.join();
+        c2.join();
+        
+        System.out.println("");
+
+        Assert.assertEquals("None", b1.failedReason);
+        Assert.assertEquals("None", b2.failedReason);
+        Assert.assertEquals("None", c1.failedReason);
+        Assert.assertEquals("None", c2.failedReason);
+    }
+    
+    /**
+     * Line 260:<br>
+     * <li>REQUEST</li>
+     * <p>
+     * Lines 286 to 289:<br>
+     * The lifecycle of request scope extends from the point a request on a
+     * remotable interface enters the SCA runtime and a thread processes that
+     * request until the thread completes synchronously processing the request.
+     * During that time, all service requests will be delegated to the same
+     * implementation instance of a request-scoped component.<br>
+     * <p>
+     */
+    @Test
+    public void atScope2() throws Exception {
+        System.out.println("atScope2");
+        ArrayList<DThread> d = new ArrayList<DThread>();
+        for (int i = 0; i < numDThread; i++)
+        	d.add(new DThread("ThreadD"+i));
+        for (int i = 0; i < numDThread; i++)
+        	d.get(i).start();
+        for (int i = 0; i < numDThread; i++)
+        	d.get(i).join();
+        System.out.println("");
+        for (int i = 0; i < numDThread; i++)
+        	Assert.assertEquals("None", d.get(i).failedReason);
+    }
+    
+    /**
+     * Line 262:<br>
+     * <li>COMPOSITE</li>
+     * <p>
+     * Lines 296 to 298:<br>
+     * All service requests are dispatched to the same implementation instance
+     * for the lifetime of the containing composite. The lifetime of the
+     * containing composite is defined as the time it becomes active in the
+     * runtime to the time it is deactivated, either normally or abnormally.<br>
+     * <p>
+     * Following lines should be found at System out<br>
+     * atScope3 - Cleaning up<br>
+     * FService1->destroyFService
+     */
+    @Test
+    public void atScope3() throws Exception {
+        System.out.println("atScope3");
+        FService fService = ServiceFinder.getService(FService.class, "FComponent");
+        String serviceName = fService.getName();
+        boolean isInitReady   = fService.isInitReady();
+
+        ArrayList<FThread> f = new ArrayList<FThread>();
+        for (int i = 0; i < numFThread; i++)
+        	f.add(new FThread("ThreadF"+i));
+        for (int i = 0; i < numFThread; i++)
+        	f.get(i).start();
+        for (int i = 0; i < numFThread; i++)
+        	f.get(i).join();
+        for (int i = 0; i < numFThread; i++) {
+        	Assert.assertEquals(serviceName, f.get(i).serviceName);
+        }
+        
+        int instanceCounter   = fService.getInstanceCounter();
+        int initCalledCounter = fService.getInitCalledCounter();
+        int destroyCalledCounter = fService.getDestroyCalledCounter();
+        System.out.println("");
+        
+        Assert.assertTrue(isInitReady);
+        Assert.assertEquals(1, instanceCounter);
+        Assert.assertEquals(1, initCalledCounter);
+        Assert.assertEquals(0, destroyCalledCounter);
+    }
+    
+    /**
+     * Lines 299 to 302:<br>
+     * A composite scoped implementation may also specify eager initialization
+     * using the "@EagerInit" annotation. When marked for eager initialization,
+     * the composite scoped instance will be created when its containing
+     * component is started. If a method is marked with the "@Init" annotation,
+     * it will be called when the instance is created.<p>
+     * Section 1.8.9 "@EagerInit"<br>
+     * <p>
+     * GService is defined as eager initialization. It will be initialized
+     * when calls SCADomain.newInstance(compositeName), so the 
+     * initCalledCounter is 1.
+     */
+    @Test
+    public void atScope4() throws Exception {
+        System.out.println("atScope4");
+
+        GService gService = ServiceFinder.getService(GService.class, "GComponent");
+        int initCalledCounter    = gService.getInitCalledCounter();
+        int destroyCalledCounter = gService.getDestroyCalledCounter();
+        
+        System.out.println("initCalledCounter="+ initCalledCounter);
+        System.out.println("destroyCalledCounter="+ destroyCalledCounter);
+        System.out.println("");
+
+        Assert.assertEquals(1, initCalledCounter);
+        Assert.assertEquals(0, destroyCalledCounter);
+    }
+    
+    /**
+     * Line 261:<br>
+     * <li>CONVERSATION</li>
+     * <p>
+     * Lines 305 to 310:<br>
+     * A conversation is defined as a series of correlated interactions between
+     * a client and a target service. A conversational scope starts when the
+     * first service request is dispatched to an implementation instance
+     * offering a conversational service. A conversational scope completes
+     * after an end operation defined by the service contract is called and
+     * completes processing or the conversation expires. A conversation may be
+     * long-running and the SCA runtime may choose to passivate implementation
+     * instances. If this occurs, the runtime must guarantee implementation
+     * instance state is preserved.
+     */
+    @Test
+    public void atScope5() throws Exception {
+        System.out.println("atScope5");
+
+        ArrayList<HThread> g = new ArrayList<HThread>();
+        for (int i = 0; i < numHThread; i++)
+        	g.add(new HThread("ThreadH"+i));
+        for (int i = 0; i < numHThread; i++)
+        	g.get(i).start();
+        for (int i = 0; i < numHThread; i++)
+        	g.get(i).join();
+        
+        HService hService = ServiceFinder.getService(HService.class, "HComponent");
+        String failedReason = hService.testCounters(numHThread);
+        System.out.println("");
+
+        for (int i = 0; i < numHThread; i++)
+        	Assert.assertEquals("None", g.get(i).failedReason);
+        Assert.assertEquals("None", failedReason);
+    }
+
+    /** Lines 290 to 293:<br>
+    * There are times when a local request scoped service is called without
+    * there being a remotable service earlier in the call stack, such as when
+    * a local service is called from a non-SCA entity. In these cases, a
+    * remote request is always considered to be present, but the lifetime of
+    * the request is implementation dependent. For example, a timer event
+    * could be treated as a remote request..<br>
+    * <p>
+    * When the composite runs, composite scope service JService kicks off a
+    * timer by the @Init method.  When the timer expires, JService invokes a
+    * method that calls an operation on the reference to a stateless scope
+    * sevice KService. KService calls a request scope service LService
+    * multiple times. The results of the calls to LService should be set up to
+    * differ depending on whether the same instance is called each time -
+    * without the interface being declared Conversational.<br>
+    * <p>
+    */
+    @Test
+    public void atScope6() throws Exception {
+        System.out.println("atScope6");
+
+        JService jService = ServiceFinder.getService(JService.class, "JComponent");
+		jService.getName();
+		Thread.sleep(2000);
+		String failedReason = jService.getFailedReason();
+        System.out.println("");
+
+        Assert.assertEquals("", failedReason);
+    }
+    
+    /**
+     * Same as atScope6 but the timer triggers KService multiple times.<br>
+     */
+    @Test
+    @Ignore("TUSCANY-2256")
+    public void atScope7() throws Exception {
+        System.out.println("atScope7");
+
+        MService mService = ServiceFinder.getService(MService.class, "MComponent");
+        mService.getName();
+		Thread.sleep(6000);
+		String failedReason = mService.getFailedReason();
+        System.out.println("");
+
+        Assert.assertEquals("", failedReason);
+    }
+    
+    private  class BThread extends Thread {
+    	private String name = null;
+    	public String failedReason = "Unknown";
+    	
+    	public BThread(String name) {
+    		super();
+    		this.name = name;
+    		failedReason = "Unknown";
+    	}
+    	
+    	@Override
+    	public void run() {
+    		BService bService = ServiceFinder.getService(BService.class, "BComponent");
+    		bService.setCurrentState(name + "-state-1");
+    		System.out.println(name + "->" + bService.getName());
+    		if (!bService.isInitReady()) {
+    			failedReason = "InitNotReady";
+    			return;
+    		}
+    		if (bService.getCurrentState() != null) {
+    			failedReason = "CurrentStateNotNull";
+    			return;
+    		}
+    		int counter = bService.getInstanceCounter();
+    		if (counter < 2) {
+    			failedReason = "OnlyOneInstance - " + counter;
+    			return;
+    		}
+    		counter = bService.getInitCalledCounter();
+    		if (counter < 2) {
+    			failedReason = "InitBeCalledOnce - " + counter;
+    			return;
+    		}
+    		counter = bService.getDestroyCalledCounter();
+    		if (counter < 2) {
+    			failedReason = "DestroyBeCalledOnce - " + counter;
+    			return;
+    		}
+    		failedReason = "None";
+        }
+      }
+
+    private  class CThread extends Thread {
+    	private String name = null;
+    	public String failedReason = "Unknown";
+    	
+    	public CThread(String name) {
+    		super();
+    		this.name = name;
+    		failedReason = "Unknown";
+    	}
+    	
+    	@Override
+    	public void run() {
+    		CService cService = ServiceFinder.getService(CService.class, "CComponent");
+    		cService.setCurrentState(name + "-state-1");
+    		System.out.println(name + "->" + cService.getName());
+    		if (!cService.isInitReady()) {
+    			failedReason = "InitNotReady";
+    			return;
+    		}
+    		if (cService.getCurrentState() != null) {
+    			failedReason = "CurrentStateNotNull";
+    			return;
+    		}
+    		int counter = cService.getInstanceCounter();
+    		if (counter < 2) {
+    			failedReason = "OnlyOneInstance - " + counter;
+    			return;
+    		}
+    		counter = cService.getInitCalledCounter();
+    		if (counter < 2) {
+    			failedReason = "InitBeCalledOnce - " + counter;
+    			return;
+    		}
+    		counter = cService.getDestroyCalledCounter();
+    		if (counter < 2) {
+    			failedReason = "DestroyBeCalledOnce - " + counter;
+    			return;
+    		}
+    		failedReason = "None";
+        }
+    }
+    
+    private  class DThread extends Thread {
+    	
+    	private String name = null;
+    	public String failedReason = "Unknown";
+    	
+    	public DThread(String name) {
+    		super();
+    		this.name = name;
+    		failedReason = "Unknown";
+    	}
+    	
+    	@Override
+    	public void run() {
+    		DService dService = ServiceFinder.getService(DService.class, "DComponent");
+    		String serviceName = dService.getName();
+    		System.out.println(name + "->" + serviceName);
+    		
+    		for (int i = 0; i < 10; i++) {
+    			String newState = name + "-state-" + i;
+    			dService.setCurrentState(newState);
+    			String currentState = dService.getCurrentState();
+    			if (!currentState.equals(serviceName + "-" + newState)) {
+    				failedReason = "CurrentStateLost - " + currentState;
+    				return;
+    			}
+    		}
+    		
+    		if (!dService.isInitReady()) {
+    			failedReason = "InitNotReady";
+    			return;
+    		}
+
+    		int counter = dService.getInstanceCounter();
+    		if (counter > numDThread) {
+    			failedReason = "TooMuchInstance - " + counter;
+    			return;
+    		}
+    		
+    		counter = dService.getInitCalledCounter();
+    		if (counter > numDThread) {
+    			failedReason = "InitBeCalledTooMuch - " + counter;
+    			return;
+    		}
+    		
+    		// JIRA T-2215
+    		/* Don't know when destroy method be called
+    		counter = dService.getDestroyCalledCounter();
+    		if (counter > numDThreads) {
+    			failedReason = "DestroyBeCalledTooMuch - " + counter;
+    			return;
+    		}
+    		*/
+    		failedReason = "None";
+        }
+    }
+    
+    private  class FThread extends Thread {
+    	
+    	private String name = null;
+
+    	public String serviceName = null;
+    	
+    	public FThread(String name) {
+    		super();
+    		this.name = name;
+    	}
+    	
+    	@Override
+    	public void run() {
+    		FService fService = ServiceFinder.getService(FService.class, "FComponent");
+    		serviceName = fService.getName();
+    		System.out.println(name + "->" + serviceName);
+
+    		for (int i = 0; i < 10; i++) {
+    			String newState = name + "-state-" + i;
+    			fService.setCurrentState(newState);
+    			fService.getCurrentState();
+    		}
+        }
+    }
+    
+    private  class HThread extends Thread {
+    	
+    	public String failedReason = "Unknown";
+    	
+    	public HThread(String name) {
+    		super();
+    		failedReason = "Unknown";
+    	}
+    	
+    	@Override
+    	public void run() {
+    		HService hService = ServiceFinder.getService(HService.class, "HComponent");
+    		failedReason = hService.test();
+        }
+    }
+
+}
+
+
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/pom.xml
new file mode 100644
index 0000000000..496c20ad41
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/pom.xml
@@ -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>1.5-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>vtest-java-api-annotations-service</artifactId>
+    <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - Annotations - @Service</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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
new file mode 100644
index 0000000000..a923faf5ae
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
@@ -0,0 +1,34 @@
+/*
+ * 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.service;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.AObject;
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Remotable Service
+ */
+@Remotable
+public interface AService {
+
+    public String getName();
+
+    public String setAObject(AObject a);
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
new file mode 100644
index 0000000000..26bcf3b9db
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
@@ -0,0 +1,33 @@
+/*
+ * 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.service;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.AObject;
+
+/**
+ * Simple Local Service
+ */
+public interface BService {
+
+    public String getName();
+
+    public String setAObject(AObject a);
+
+    public String testServices();
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
new file mode 100644
index 0000000000..4f4f1e80c7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
@@ -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.annotations.service;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.AObject;
+
+/**
+ * Simple Local Service without defining "@Service" at the implementation class
+ */
+public interface CService {
+
+    public String getName();
+
+    public String setAObject(AObject a);
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
new file mode 100644
index 0000000000..ffabb3619c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
@@ -0,0 +1,28 @@
+/*
+ * 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.service;
+
+/**
+ * Simple Local Service
+ */
+public interface DService1 {
+
+    public String getName1();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
new file mode 100644
index 0000000000..83d7980dbc
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
@@ -0,0 +1,28 @@
+/*
+ * 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.service;
+
+/**
+ * Simple Local Service
+ */
+public interface DService2 {
+
+    public String getName2();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
new file mode 100644
index 0000000000..a416e33de7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
@@ -0,0 +1,28 @@
+/*
+ * 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.service;
+
+/**
+ * Simple Local Service
+ */
+public interface DService3 {
+
+    public String getName3();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
new file mode 100644
index 0000000000..ad44d2b93a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
@@ -0,0 +1,30 @@
+/*
+ * 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.service;
+
+/**
+ * Simple Local Service which implementation class defines
+ * 
+ * @Service() with no attributes
+ */
+public interface EService {
+
+    public String getName();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
new file mode 100644
index 0000000000..52886131a1
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
@@ -0,0 +1,30 @@
+/*
+ * 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.service;
+
+/**
+ * Simple Local Service which implementation class defines
+ * 
+ * @Service with full package name
+ */
+public interface FService {
+
+    public String getName();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
new file mode 100644
index 0000000000..bd1a3a5fe6
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
@@ -0,0 +1,30 @@
+/*
+ * 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.service;
+
+/**
+ * Simple Local Service
+ */
+public interface GService1 {
+
+    public String getName();
+
+    public String getServiceName();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
new file mode 100644
index 0000000000..0f8c7dabcb
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
@@ -0,0 +1,26 @@
+/*
+ * 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.service;
+
+/**
+ * Simple Local Service
+ */
+public interface GService2 extends GService1 {
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
new file mode 100644
index 0000000000..e50e230bd4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
@@ -0,0 +1,50 @@
+/*
+ * 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.service;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.AObject;
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Remotable Service
+ */
+@Remotable
+public interface HService {
+
+    public String getName();
+
+    public String setAObject1(AObject a);
+
+    public String setAObject2(AObject a);
+
+    public String getComponentName();
+    
+    public String getAObject1String();
+
+    public String getAObject2String();
+
+    public String getAObject3String();
+
+    public AObject getAObject3();
+    
+    public String getServiceName1();
+    
+    public String getServiceName2();
+    
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
new file mode 100644
index 0000000000..e3a1462f88
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.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.annotations.service;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.AObject;
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Remotable Service
+ */
+@Remotable
+public interface IService {
+
+    public String getName();
+
+    public String setAObject1(AObject a);
+
+    public String setAObject2(AObject a);
+
+    public void setComponentName1(String componentName1);
+    
+    public String getComponentName1();
+    
+    public String getComponentName2();
+    
+    public String getAObject1String();
+
+    public String getAObject2String();
+
+    public String getAObject3String();
+    
+    public AObject getAObject3();
+    
+    public String getServiceName1();
+    
+    public String getServiceName2();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
new file mode 100644
index 0000000000..0ab2e29194
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
@@ -0,0 +1,33 @@
+/*
+ * 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.service.impl;
+
+/**
+ * A simple object to hold a string
+ */
+public class AObject {
+
+    public String aString;
+
+    public AObject() {
+        this.aString = null;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
new file mode 100644
index 0000000000..7ce2235719
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.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.annotations.service.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.AService;
+import org.osoa.sca.annotations.Service;
+
+@Service(AService.class)
+public class AServiceImpl implements AService {
+
+    public String getName() {
+        return "AService";
+    }
+
+    public String setAObject(AObject a) {
+        a.aString = "AService";
+        return "AService";
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
new file mode 100644
index 0000000000..9c3f15743c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
@@ -0,0 +1,111 @@
+/*
+ * 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.service.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.AService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.BService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.CService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.HService;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.IService;
+import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.Reference;
+
+@Service(BService.class)
+public class BServiceImpl implements BService {
+
+	@Reference(required=false)
+	public AService aService = null;
+	
+	@Reference(required=false)
+	public CService cService = null;
+
+	@Reference(required=false)
+	public HService hService = null;
+
+	@Reference(required=false)
+	public IService iService = null;
+
+    public String getName() {
+        return "BService";
+    }
+
+    public String setAObject(AObject a) {
+        a.aString = "BService";
+        return "BService";
+    }
+    
+    public String testServices() {
+    	
+    	AObject a = new AObject();
+    	aService.setAObject(a);
+    	if (a.aString != null)
+    		return "AServiceNotPassByValue";
+    	
+    	AObject c = new AObject();
+    	cService.setAObject(c);
+    	if (c.aString == null || !c.aString.equals("CService"))
+    		return "CServiceNotPassByReference";
+    	
+
+    	AObject h1 = new AObject();
+    	hService.setAObject1(h1);
+    	if (h1.aString == null || !h1.aString.equals("HService"))
+    		return "HServiceSetAObject1NotPassByReference";
+    	h1.aString = "testServices";
+    	if (!hService.getAObject1String().equals("testServices"))
+    		return "HServiceGetAObject1NotPassByReference";
+    	
+    	AObject h2 = new AObject();
+    	hService.setAObject2(h2);
+    	if (h2.aString != null)
+    		return "HServiceSetAObject2NotPassByValue";
+    	h2.aString = "testServices";
+    	if (!hService.getAObject2String().equals("HService"))
+    		return "HServiceGetAObject1NotPassByValue";
+    	
+    	AObject h3 = hService.getAObject3();
+        h3.aString = "testServices";
+    	if (!hService.getAObject3String().equals("HService"))
+    		return "HServiceGetAObject3NotPassByValue";
+        
+    	AObject i1 = new AObject();
+    	iService.setAObject1(i1);
+    	if (i1.aString == null || !i1.aString.equals("IService"))
+    		return "IServiceSetAObject1NotPassByReference";
+    	i1.aString = "testServices";
+    	if (!iService.getAObject1String().equals("testServices"))
+    		return "IServiceGetAObject1NotPassByReference";
+
+    	AObject i2 = new AObject();
+    	iService.setAObject2(i2);
+    	if (i2.aString == null || !i2.aString.equals("IService"))
+    		return "IServiceSetAObject2NotPassByReference";
+    	i2.aString = "testServices";
+    	if (!iService.getAObject2String().equals("testServices"))
+    		return "IServiceGetAObject2NotPassByReference";
+
+        AObject i3 = iService.getAObject3();
+        i3.aString = "testServices";
+    	if (!iService.getAObject3String().equals("testServices"))
+    		return "IServiceGetAObject3NotPassByReference";
+
+    	return "None";
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
new file mode 100644
index 0000000000..3fc23d2f68
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
@@ -0,0 +1,34 @@
+/*
+ * 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.service.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.CService;
+
+public class CServiceImpl implements CService {
+
+    public String getName() {
+        return "CService";
+    }
+
+    public String setAObject(AObject a) {
+        a.aString = "CService";
+        return "CService";
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
new file mode 100644
index 0000000000..4cc9430c74
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.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.annotations.service.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.DService1;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.DService2;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.DService3;
+import org.osoa.sca.annotations.Service;
+
+@Service(interfaces = {DService1.class, DService2.class})
+public class DServiceImpl implements DService1, DService2, DService3 {
+
+    public String getName1() {
+        return "DService1";
+    }
+
+    public String getName2() {
+        return "DService2";
+    }
+
+    public String getName3() {
+        return "DService3";
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
new file mode 100644
index 0000000000..a64d434a46
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
@@ -0,0 +1,32 @@
+/*
+ * 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.service.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.EService;
+import org.osoa.sca.annotations.Service;
+
+@Service()
+public class EServiceImpl implements EService {
+
+    public String getName() {
+        return "EService";
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
new file mode 100644
index 0000000000..49f34738ef
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.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.annotations.service.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.FService;
+import org.osoa.sca.RequestContext;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Service;
+
+@Service(org.apache.tuscany.sca.vtest.javaapi.annotations.service.FService.class)
+public class FServiceImpl implements FService {
+
+    @Context
+    public RequestContext requestContext;
+    
+    public String getName() {
+        return requestContext.getServiceName();
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
new file mode 100644
index 0000000000..46370b7e19
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
@@ -0,0 +1,26 @@
+/*
+ * 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.service.impl;
+
+import org.osoa.sca.annotations.Service;
+
+@Service(FServiceImpl2.class)
+public class FServiceImpl2 extends FServiceImpl  {
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
new file mode 100644
index 0000000000..a86d6e1da0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
@@ -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.annotations.service.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.GService1;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.GService2;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Service;
+import org.osoa.sca.RequestContext;
+
+@Service(interfaces = {GService1.class, GService2.class})
+public class GServiceImpl implements GService1 {
+
+    @Context
+    public RequestContext requestContext;
+
+    public String getName() {
+        return "GService";
+    }
+
+    public String getServiceName() {
+        return requestContext.getServiceName();
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
new file mode 100644
index 0000000000..ac525ea669
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
@@ -0,0 +1,105 @@
+/*
+ * 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.service.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.HService;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.RequestContext;
+import org.osoa.sca.annotations.ComponentName;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.AllowsPassByReference;
+
+@Service(HService.class)
+@Scope("REQUEST")
+public class HServiceImpl implements HService {
+
+	@ComponentName
+	protected String componentName; 
+	
+	private AObject aObject1 = null;
+
+	private AObject aObject2 = null;
+
+	private AObject aObject3 = null;
+	
+    public RequestContext requestContext;
+    
+    public ComponentContext componentContext;
+    
+    public String getName() {
+        return "HService";
+    }
+
+    @AllowsPassByReference
+    public String setAObject1(AObject a) {
+        a.aString = "HService";
+        aObject1 = a;
+        return "HService";
+    }
+
+    public String setAObject2(AObject a) {
+        a.aString = "HService";
+        aObject2 = a;
+        return "HService";
+    }
+
+    @Context
+	public void setComponentContext(ComponentContext componentContext) {
+		this.componentContext = componentContext;
+	}
+
+    @Context
+	public void setRequestContext(RequestContext requestContext) {
+		this.requestContext = requestContext;
+	}
+
+	public String getComponentName() {
+		return componentName;
+	}
+
+    public String getAObject1String() {
+        return aObject1.aString;
+    }
+    
+    public String getAObject2String() {
+        return aObject2.aString;
+    }
+
+    public String getAObject3String() {
+        return aObject3.aString;
+    }
+
+    public AObject getAObject3() {
+    	aObject3 = new AObject();
+    	aObject3.aString = "HService";
+        return aObject3;
+    }
+    
+    public String getServiceName1() {
+        return requestContext.getServiceName();
+    }
+    
+    public String getServiceName2() {
+        return componentContext.getRequestContext().getServiceName();
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
new file mode 100644
index 0000000000..f2760b96ab
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
@@ -0,0 +1,107 @@
+/*
+ * 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.service.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.IService;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.RequestContext;
+import org.osoa.sca.annotations.AllowsPassByReference;
+import org.osoa.sca.annotations.ComponentName;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(IService.class)
+@Scope("REQUEST")
+@AllowsPassByReference
+public class IServiceImpl implements IService {
+
+	@ComponentName
+	public String componentName1; 
+
+	public String componentName2; 
+
+	private AObject aObject1 = null;
+
+	private AObject aObject2 = null;
+
+	private AObject aObject3 = null;
+
+    @Context
+    public RequestContext requestContext;
+    
+    @Context
+    public ComponentContext componentContext;
+    
+    public String getName() {
+        return "IService";
+    }
+
+    public String setAObject1(AObject a) {
+        a.aString = "IService";
+        aObject1 = a;
+        return "IService";
+    }
+
+    public String setAObject2(AObject a) {
+        a.aString = "IService";
+        aObject2 = a;
+        return "IService";
+    }
+
+	@ComponentName
+	public void setComponentName1(String componentName1) {
+		this.componentName2 = componentName1;
+	}
+
+    public String getAObject1String() {
+        return aObject1.aString;
+    }
+
+    public String getAObject2String() {
+        return aObject2.aString;
+    }
+
+    public String getAObject3String() {
+        return aObject3.aString;
+    }
+
+    public AObject getAObject3() {
+    	aObject3 = new AObject();
+    	aObject3.aString = "IService";
+        return aObject3;
+    }
+
+	public String getComponentName1() {
+		return componentName1;
+	}
+
+	public String getComponentName2() {
+		return componentName2;
+	}
+
+    public String getServiceName1() {
+        return requestContext.getServiceName();
+    }
+    
+    public String getServiceName2() {
+        return componentContext.getRequestContext().getServiceName();
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/resources/service.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/resources/service.composite
new file mode 100644
index 0000000000..0731986df2
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/resources/service.composite
@@ -0,0 +1,82 @@
+<?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="Service-Composite">
+
+	<component name="AComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.AServiceImpl" />
+	</component>
+
+	<component name="BComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.BServiceImpl" />
+	</component>
+
+	<component name="BComponent1">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.BServiceImpl" />
+		<reference name="aService" target="AComponent"/>	
+		<reference name="cService" target="CComponent"/>	
+		<reference name="hService" target="HComponent"/>	
+		<reference name="iService" target="IComponent"/>	
+	</component>
+
+	<component name="CComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.CServiceImpl" />
+	</component>
+
+	<component name="DComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.DServiceImpl" />
+	</component>
+
+	<component name="EComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.EServiceImpl" />
+	</component>
+
+	<component name="FComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.FServiceImpl" />
+	</component>
+
+	<component name="FComponent2">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.FServiceImpl2" />
+	</component>
+
+	<component name="GComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.GServiceImpl" />
+	</component>
+	
+	<component name="HComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.HServiceImpl" />
+	</component>
+	
+	<component name="IComponent">
+		<implementation.java
+			class="org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.IServiceImpl" />
+	</component>
+	
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
new file mode 100644
index 0000000000..52f7821ebb
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
@@ -0,0 +1,335 @@
+/*
+ * 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.service;
+
+import static org.junit.Assert.fail;
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.AObject;
+import org.apache.tuscany.sca.vtest.javaapi.annotations.service.impl.FServiceImpl2;
+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
+ * including 1.3.1, 1.8.1, 1.8.3, 1.8.6, 1.8.15 and 1.8.17<br>
+ * but not..<br>
+ * <li>Lines 1531 to 1534</li>
+ */
+public class ServiceAnnotationTestCase {
+
+    protected static String compositeName = "service.composite";
+    protected static AService aService = null;
+    protected static BService bService = null;
+    protected static BService bService1 = null;
+    protected static HService hService = null;
+    protected static IService iService = null;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        try {
+            System.out.println("Setting up");
+            ServiceFinder.init(compositeName);
+            aService = ServiceFinder.getService(AService.class, "AComponent");
+            bService = ServiceFinder.getService(BService.class, "BComponent");
+            bService1 = ServiceFinder.getService(BService.class, "BComponent1");
+            hService = ServiceFinder.getService(HService.class, "HComponent");
+            iService = ServiceFinder.getService(IService.class, "IComponent");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void destroy() throws Exception {
+
+        System.out.println("Cleaning up");
+        ServiceFinder.cleanup();
+
+    }
+
+    /**
+     * Line 215:<br>
+     * <li>As a Java interface</li>
+     * <p>
+     * Line 1622 to 1623:<br>
+     * The
+     * 
+     * @Service annotation type is used on a component implementation class to
+     *          specify the SCA services offered by the implementation.<br>
+     */
+    @Test
+    public void atService1() throws Exception {
+        Assert.assertEquals("AService", aService.getName());
+    }
+
+    /**
+     * Line 216:<br>
+     * <li>As a Java class</li>
+     * <p>
+     * Line 1631:<br>
+     * <li>value – A shortcut for the case when the class provides only a
+     * single service interface.</li>
+     */
+    @Test
+    public void atService2() throws Exception {
+        Assert.assertEquals("BService", bService.getName());
+    }
+
+    /**
+     * Lines 222 to 224:<br>
+     * A remotable service is defined using the "@Remotable" annotation on the
+     * Java interface that defines the service. Remotable services are intended
+     * to be used for coarse grained services, and the parameters are passed
+     * by-value.<br>
+     * <p>
+     * Lines 321 to 323:<br>
+     * The "@Remotable" annotation on a Java interface indicates that the
+     * interface is designed to be used for remote communication. Remotable
+     * interfaces are intended to be used for coarse grained services.
+     * Operations parameters and return values are passed by-value.<br>
+     */
+    @Test
+    public void atService3() throws Exception {
+        AObject o = new AObject();
+        Assert.assertEquals("AService", aService.setAObject(o));
+        Assert.assertNull(o.aString);
+    }
+
+    /**
+     * Lines 227 to 242:<br>
+     * A local service can only be called by clients that are deployed within
+     * the same address space as the component implementing the local service.<br>
+     * ...<br>
+     * The data exchange semantic for calls to local services is by-reference.<br>
+     * ...<br>
+     * Lines 996 to 1028:<br>
+     * 1.8.1 "@AllowsPassByReference"<br>
+     * ...<br>
+     * Lines 1535 to 1540:<br>
+     * Independent of whether the remotable service is called from outside of
+     * the composite that contains it or from another component in the same
+     * composite, the data exchange semantics are by-value.<br>
+     * Implementations of remotable services may modify input data during or
+     * after an invocation and may modify return data after the invocation. If a
+     * remotable service is called locally or remotely, the SCA container is
+     * responsible for making sure that no modification of input data or
+     * post-invocation modifications to return data are seen by the caller.<br>
+     * <p>
+     * Test under Non-SCA <-> SCA
+     * <li>BService is local service to test by reference</li>
+     * <li>HService is remotable service to test "@AllowsPassByReference" at
+     * method level</li>
+     * <li>IService is remotable service to test "@AllowsPassByReference" at
+     * class level</li>
+     */
+    @Test
+    public void atService4() throws Exception {
+        AObject b = new AObject();
+        Assert.assertEquals("BService", bService.setAObject(b));
+        Assert.assertEquals("BService", b.aString);
+
+        AObject h1 = new AObject();
+        Assert.assertEquals("HService", hService.setAObject1(h1));
+        Assert.assertEquals("HService", h1.aString);
+        h1.aString = "atService4";
+        Assert.assertEquals("atService4", hService.getAObject1String());
+
+        AObject h2 = new AObject();
+        Assert.assertEquals("HService", hService.setAObject2(h2));
+        Assert.assertNull(h2.aString);
+        h2.aString = "atService4";
+        Assert.assertEquals("HService", hService.getAObject2String());
+
+        AObject h3 = hService.getAObject3();
+        h3.aString = "atService4";
+        Assert.assertEquals("HService", hService.getAObject3String());
+
+        AObject i1 = new AObject();
+        Assert.assertEquals("IService", iService.setAObject1(i1));
+        Assert.assertEquals("IService", i1.aString);
+        i1.aString = "atService4";
+        Assert.assertEquals("atService4", iService.getAObject1String());
+
+        AObject i2 = new AObject();
+        Assert.assertEquals("IService", iService.setAObject2(i2));
+        Assert.assertEquals("IService", i2.aString);
+        i2.aString = "atService4";
+        Assert.assertEquals("atService4", iService.getAObject2String());
+
+        AObject i3 = iService.getAObject3();
+        i3.aString = "atService4";
+        Assert.assertEquals("atService4", iService.getAObject3String());
+    }
+
+    /**
+     * Line 1624 to 1627:<br>
+     * A class used as the implementation of a service is not required to have
+     * an "@Service" annotation. If a class has no "@Service" annotation, then
+     * the rules determining which services are offered and what interfaces
+     * those services have are determined by the specific implementation type.
+     * <br>
+     */
+    @Test
+    public void atService5() throws Exception {
+        CService cService = ServiceFinder.getService(CService.class, "CComponent");
+        Assert.assertEquals("CService", cService.getName());
+    }
+
+    /**
+     * Line 1623 to 1624:<br>
+     * The class need not be declared as implementing all of the interfaces
+     * implied by the services, but all methods of the service interfaces must
+     * be present.<br>
+     * <p>
+     * Line 1629 to 1630:<br>
+     * <li>interfaces – The value is an array of interface or class objects
+     * that should be exposed as services by this component.</li>
+     */
+    @Test
+    public void atService6() throws Exception {
+        DService1 dService1 = ServiceFinder.getService(DService1.class, "DComponent/DService1");
+        Assert.assertEquals("DService1", dService1.getName1());
+        DService2 dService2 = ServiceFinder.getService(DService2.class, "DComponent/DService2");
+        Assert.assertEquals("DService2", dService2.getName2());
+        try {
+            ServiceFinder.getService(DService3.class, "DComponent/DService3");
+            fail("Should have failed to get this service");
+        } catch (Exception e) {
+            // Expect an exception
+        }
+    }
+
+    /**
+     * Line 1635 to 1636:<br>
+     * A "@Service" annotation with no attributes is meaningless, it is the same
+     * as not having the annotation there at all.<br>
+     */
+    @Test
+    public void atService7() throws Exception {
+        EService eService = ServiceFinder.getService(EService.class, "EComponent");
+        Assert.assertEquals("EService", eService.getName());
+    }
+
+    /**
+     * Line 1637 to 1638:<br>
+     * The service names of the defined services default to the names of the
+     * interfaces or class, without the package name.<br>
+     */
+    @Test
+    public void atService8() throws Exception {
+        FService fService = ServiceFinder.getService(FService.class, "FComponent");
+        Assert.assertEquals("FService", fService.getName());
+        FServiceImpl2 fServiceImpl2 = ServiceFinder.getService(FServiceImpl2.class, "FComponent2");
+        Assert.assertEquals("FServiceImpl2", fServiceImpl2.getName());
+        fService = ServiceFinder.getService(FService.class, "FComponent2");
+        Assert.assertEquals("FServiceImpl2", fService.getName());
+    }
+
+    /**
+     * Line 1639 to 1641:<br>
+     * If a Java implementation needs to realize two services with the same
+     * interface, then this is achieved through subclassing of the interface.
+     * The subinterface must not add any methods. Both interfaces are listed in
+     * the "@Service" annotation of the Java implementation class. <br>
+     */
+    @Test
+    public void atService9() throws Exception {
+        GService1 gService1 = ServiceFinder.getService(GService1.class, "GComponent/GService1");
+        GService2 gService2 = ServiceFinder.getService(GService2.class, "GComponent/GService2");
+        Assert.assertEquals("GService", gService1.getName());
+        Assert.assertEquals("GService1", gService1.getServiceName());
+        Assert.assertEquals("GService", gService2.getName());
+        Assert.assertEquals("GService2", gService2.getServiceName());
+    }
+
+    /**
+     * Lines 227 to 242:<br>
+     * A local service can only be called by clients that are deployed within
+     * the same address space as the component implementing the local service.<br>
+     * ...<br>
+     * The data exchange semantic for calls to local services is by-reference.<br>
+     * ...<br>
+     * Lines 996 to 1028:<br>
+     * 1.8.1 "@AllowsPassByReference"<br>
+     * ...<br>
+     * Lines 1535 to 1540:<br>
+     * Independent of whether the remotable service is called from outside of
+     * the composite that contains it or from another component in the same
+     * composite, the data exchange semantics are by-value.<br>
+     * Implementations of remotable services may modify input data during or
+     * after an invocation and may modify return data after the invocation. If a
+     * remotable service is called locally or remotely, the SCA container is
+     * responsible for making sure that no modification of input data or
+     * post-invocation modifications to return data are seen by the caller.<br>
+     * <p>
+     * Test under SCA <-> SCA<br>
+     * <li>AService is remotable service to test by value</li>
+     * <li>CService is local service to test by-reference</li>
+     * <li>HService is remotable service to test "@AllowsPassByReference" at
+     * method level</li>
+     * <li>IService is remotable service to test "@AllowsPassByReference" at
+     * class level</li>
+     */
+    @Test
+    public void atService10() throws Exception {
+        Assert.assertEquals("None", bService1.testServices());
+    }
+
+    /**
+     * Lines 1095 to 1124:<br>
+     * 1.8.3. "@ComponentName"<br>
+     * ...<br>
+     * The "@ComponentName" annotation type is used to annotate a Java class
+     * field or setter method that is used to inject the component name.<br>
+     * ...<br>
+     */
+    @Test
+    public void atService11() throws Exception {
+        Assert.assertEquals("HComponent", hService.getComponentName());
+        Assert.assertNull(iService.getComponentName1());
+        Assert.assertEquals("IComponent", iService.getComponentName2());
+    }
+
+    /**
+     * Lines 1164 to 1187:<br>
+     * 1.8.6. "@Context"<br>
+     * ...<br>
+     * The "@Context" annotation type is used to annotate a Java class field or
+     * a setter method that is used to inject a composite context for the
+     * component. The type of context to be injected is defined by the type of
+     * the Java class field or type of the setter method input argument, the
+     * type is either ComponentContext or RequestContext.<br>
+     * ...<br>
+     * <p>
+     * HService - "@Context" is used to annotate setter methods<br>
+     * IService - "@Context" is used to annotate class fields<br>
+     * <br>
+     */
+    @Test
+    public void atService12() throws Exception {
+        Assert.assertEquals("HService", hService.getServiceName1());
+        Assert.assertEquals("HService", hService.getServiceName2());
+        Assert.assertEquals("IService", iService.getServiceName1());
+        Assert.assertEquals("IService", iService.getServiceName2());
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/pom.xml
new file mode 100644
index 0000000000..916b3bc0f2
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/pom.xml
@@ -0,0 +1,45 @@
+<?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-apis</artifactId>
+        <version>1.5-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>vtest-java-api-apis-callablereference</artifactId>
+    <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - APIs - CallableReference</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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
new file mode 100644
index 0000000000..a3f6d48685
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
@@ -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.apis.callablereference;
+
+import org.osoa.sca.annotations.Conversational;
+
+/**
+ * Simple Service A.
+ */
+@Conversational
+public interface AComponent {
+
+    public String getName();
+
+    public String getServiceName();
+    public String getBusinessInterfaceName();
+    public boolean isConversational();
+    public void testConversationID();
+    public String getCallbackResult();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
new file mode 100644
index 0000000000..707568e507
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
@@ -0,0 +1,26 @@
+/*
+ * 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.apis.callablereference;
+
+public interface BCallback {
+
+    public void processResults(String result);        
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
new file mode 100644
index 0000000000..1a62b86c22
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
@@ -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.apis.callablereference;
+
+import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.Conversational;
+
+/**
+ * Simple Service B.
+ */
+@Conversational
+@Callback(BCallback.class)
+public interface BComponent {
+
+    public String getName();
+    
+    public void testCallback();
+    public void testConversationID();
+    public void testNonNullConversation();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
new file mode 100644
index 0000000000..51ee68a393
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
@@ -0,0 +1,104 @@
+/*
+ * 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.apis.callablereference.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.apis.callablereference.AComponent;
+import org.apache.tuscany.sca.vtest.javaapi.apis.callablereference.BCallback;
+import org.apache.tuscany.sca.vtest.javaapi.apis.callablereference.BComponent;
+import org.junit.Assert;
+import org.osoa.sca.CallableReference;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.ConversationID;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(AComponent.class)
+@Scope("CONVERSATION")
+public class AComponentImpl implements AComponent, BCallback {
+
+    private static Object monitor = new Object();
+    private static String returnMessage = null;
+
+    protected ComponentContext componentContext;
+    
+    @Reference
+    protected CallableReference<BComponent> bReference;
+
+    @ConversationID
+    protected String cid;
+
+    public String getName() {
+        return "ComponentA";
+    }
+
+    @Context
+    public void setComponentContext(ComponentContext context) {
+        this.componentContext = context;
+    }
+
+    public String getServiceName() {
+        return bReference.getService().getName();
+    }
+
+    public String getBusinessInterfaceName() {
+        return bReference.getBusinessInterface().getSimpleName();
+    }
+
+    public boolean isConversational() {
+        return bReference.isConversational();
+    }
+
+    public void testConversationID() {
+        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
+        bSR.setConversationID("AConversationID");
+        bSR.getService().testConversationID();
+
+        Assert.assertEquals("AConversationID", bSR.getConversation().getConversationID());
+    }
+
+    public String getCallbackResult() {
+        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
+        String cbID = "ComponentACallBack";
+        bSR.setCallbackID(cbID);
+        bSR.getService().testCallback();
+
+        // Wait for 30s max.
+        int count = 0;
+        synchronized(monitor) {
+            while (returnMessage == null && count++ < 30) {
+                try {
+                    monitor.wait(1000L);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return returnMessage;
+    }
+
+    public void processResults(String result) {
+        returnMessage = result;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
new file mode 100644
index 0000000000..f66db33a83
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
@@ -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.apis.callablereference.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.apis.callablereference.BCallback;
+import org.apache.tuscany.sca.vtest.javaapi.apis.callablereference.BComponent;
+import org.junit.Assert;
+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.ConversationID;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(BComponent.class)
+@Scope("CONVERSATION")
+public class BComponentImpl implements BComponent {
+
+    protected ComponentContext componentContext;
+    
+    @Callback
+    protected BCallback callback;
+
+    @ConversationID
+    protected String cid;
+
+    @Context
+    public void setComponentContext(ComponentContext context) {
+        this.componentContext = context;
+    }
+
+    public String getName() {
+        return "ComponentB";
+    }
+
+    public void testCallback() {
+        callback = componentContext.getRequestContext().getCallback();
+        callback.processResults("CallBackFromB");
+
+        CallableReference<BCallback> bCR = componentContext.getRequestContext().getCallbackReference();
+        Assert.assertEquals("ComponentACallBack", bCR.getCallbackID());
+    }
+
+    public void testConversationID() {
+        Assert.assertEquals("AConversationID", cid);
+    }
+
+    public void testNonNullConversation() {
+        Assert.assertNotNull(componentContext.getRequestContext().getServiceReference().getConversation());
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
new file mode 100644
index 0000000000..f997d78bb5
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
@@ -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"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://java-api-tests"
+	name="CallableReference-Composite">
+
+    <component name="AComponent">
+	    <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.callablereference.impl.AComponentImpl"/>
+	    <reference name="bReference" target="BComponent"/>
+     </component>
+
+    <component name="BComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.callablereference.impl.BComponentImpl"/>
+    </component>
+
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
new file mode 100644
index 0000000000..4d0d8338ba
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.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.apis.callablereference;
+
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * This test class tests the CallableReference interface described in 1.7.3 of
+ * the SCA Java Annotations & APIs Specification 1.0.
+ */
+public class CallableReferenceTestCase {
+
+    protected static String compositeName = "callablereference.composite";
+    protected static AComponent a;
+    protected static BComponent b;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        try {
+            System.out.println("Setting up");
+            ServiceFinder.init(compositeName);
+            a = ServiceFinder.getService(AComponent.class, "AComponent");
+            b = ServiceFinder.getService(BComponent.class, "BComponent");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void destroy() throws Exception {
+        System.out.println("Cleaning up");
+        ServiceFinder.cleanup();
+    }
+
+    /**
+     * Lines 884 <br>
+     * getService() - Returns a type-safe reference to the target of this
+     * reference. The instance returned is guaranteed to implement the business
+     * interface for this reference. The value returned is a proxy to the target
+     * that implements the business interface associated with this reference.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testGetService() throws Exception {
+        Assert.assertEquals("ComponentB", a.getServiceName());
+    }
+
+    /**
+     * Lines 885 <br>
+     * getBusinessInterface() – Returns the Java class for the business
+     * interface associated with this reference.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testGetBusinessInterface() throws Exception {
+        Assert.assertEquals("BComponent", a.getBusinessInterfaceName());
+    }
+
+    /**
+     * Lines 886 <br>
+     * isConversational() – Returns true if this reference is conversational.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testIsConversational() throws Exception {
+        Assert.assertEquals(true, a.isConversational());
+    }
+
+    /**
+     * Lines 887 <br>
+     * getConversation() – Returns the conversation associated with this
+     * reference. Returns null if no conversation is currently active.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testGetConversation() throws Exception {
+        a.testConversationID();
+        b.testNonNullConversation();
+    }
+
+    /**
+     * Lines 888 <br>
+     * getCallbackID() – Returns the callback ID.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testGetCallbackID() throws Exception {
+        // Actual test is in BComponentImpl. Below is an extra test.
+        Assert.assertEquals("CallBackFromB", a.getCallbackResult());
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/pom.xml
new file mode 100644
index 0000000000..00764ffbe5
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/pom.xml
@@ -0,0 +1,45 @@
+<?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-apis</artifactId>
+        <version>1.5-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>vtest-java-api-apis-componentcontext</artifactId>
+    <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - APIs - ComponentContext</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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
new file mode 100644
index 0000000000..b2c8c07866
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
@@ -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.apis.componentcontext;
+
+/**
+ * Simple Service A.
+ */
+public interface AComponent {
+
+    public String getName();
+
+    public String getContextURI();
+    public String getServiceBName();
+    public String getServiceReferenceBName();
+    public String getSelfReferenceName();
+    public String getProperty();
+    public String getRequestContextServiceName();
+    public String getCastCallableReferenceServiceName();
+    public String getCastServiceReferenceServiceName();
+    public void illegalCast();
+
+    public String testServiceLookup();
+    public String getRequestContextContent();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
new file mode 100644
index 0000000000..7e425c740f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
@@ -0,0 +1,29 @@
+/*
+ * 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.apis.componentcontext;
+
+/**
+ * Simple Service B.
+ */
+public interface BComponent {
+
+    String getName();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
new file mode 100644
index 0000000000..eff7cc5a88
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
@@ -0,0 +1,34 @@
+/*
+ * 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.apis.componentcontext;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Service B.
+ */
+@Remotable
+public interface BService {
+
+    String getBName();
+
+    String getSelfReferenceWithServiceName();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
new file mode 100644
index 0000000000..d0da012f6f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
@@ -0,0 +1,29 @@
+/*
+ * 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.apis.componentcontext;
+
+/**
+ * Simple Service C.
+ */
+public interface CService {
+
+    String getCName();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
new file mode 100644
index 0000000000..a221ba11fc
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
@@ -0,0 +1,29 @@
+/*
+ * 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.apis.componentcontext;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface DComponent {
+
+    public String getName();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
new file mode 100644
index 0000000000..606443a480
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
@@ -0,0 +1,124 @@
+/*
+ * 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.apis.componentcontext.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.AComponent;
+import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.BService;
+import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.DComponent;
+import org.osoa.sca.CallableReference;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.RequestContext;
+import org.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(AComponent.class)
+@Scope("COMPOSITE")
+@EagerInit
+public class AComponentImpl implements AComponent {
+
+    public static String rcContent = null;
+
+    protected ComponentContext componentContext;
+    
+    @Reference
+    protected BService bReference;
+    
+    @Reference
+    protected DComponent dReference;    
+
+    @Property(name="aProperty", required=true)
+    protected String aProperty;
+
+    public String getName() {
+        return "ComponentA";
+    }
+
+    @Context
+    public void setComponentContext(ComponentContext context) {
+        this.componentContext = context;
+    }
+
+    @Init
+    public void init() {
+        RequestContext rc = componentContext.getRequestContext();
+        if (rc != null) {
+            rcContent = "NotNull";
+        } else {
+            rcContent = "Null";
+        }
+    }
+
+    public String getContextURI() {
+        return componentContext.getURI();
+    }
+
+    public String getServiceBName() {
+        return componentContext.getService(BService.class, "bReference").getBName();
+    }
+
+    public String getServiceReferenceBName() {
+        ServiceReference<BService> bSR = componentContext.getServiceReference(BService.class, "bReference");
+        return bSR.getService().getBName();
+    }
+
+    public String getSelfReferenceName() {
+        ServiceReference<AComponent> aSR = componentContext.createSelfReference(AComponent.class);
+        return aSR.getService().getName();
+    }
+
+    public String getProperty() {
+        return componentContext.getProperty(String.class, "aProperty");
+    }
+
+    public String getRequestContextServiceName() {
+        return componentContext.getRequestContext().getServiceName();
+    }
+
+    public String getCastCallableReferenceServiceName() {
+        BService b = componentContext.getService(BService.class, "bReference");
+        CallableReference<BService> bCR = componentContext.cast(b);
+        return bCR.getService().getBName();
+    }
+
+    public String getCastServiceReferenceServiceName() {
+        BService b = componentContext.getService(BService.class, "bReference");
+        ServiceReference<BService> bSR = componentContext.cast(b);
+        return bSR.getService().getBName();
+    }
+
+    public void illegalCast() {
+        componentContext.cast("");
+    }
+
+    public String testServiceLookup() {
+        return componentContext.getService(DComponent.class, "dReference").getName();
+    }
+
+    public String getRequestContextContent() {
+        return rcContent;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
new file mode 100644
index 0000000000..34a71e1318
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
@@ -0,0 +1,121 @@
+/*
+ * 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.apis.componentcontext.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.AComponent;
+import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.BService;
+import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.DComponent;
+import org.osoa.sca.CallableReference;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.RequestContext;
+import org.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(AComponent.class)
+@Scope("COMPOSITE")
+@EagerInit
+public class AUnannotatedComponentImpl implements AComponent {
+
+    public static String rcContent = null;
+
+    protected ComponentContext componentContext;
+    
+    protected BService bReference;
+    
+    protected DComponent dReference;    
+
+    protected String aProperty;
+
+    public String getName() {
+        return "ComponentA";
+    }
+
+    @Context
+    public void setComponentContext(ComponentContext context) {
+        this.componentContext = context;
+    }
+
+    @Init
+    public void init() {
+        RequestContext rc = componentContext.getRequestContext();
+        if (rc != null) {
+            rcContent = "NotNull";
+        } else {
+            rcContent = "Null";
+        }
+    }
+
+    public String getContextURI() {
+        return componentContext.getURI();
+    }
+
+    public String getServiceBName() {
+        return componentContext.getService(BService.class, "bReference").getBName();
+    }
+
+    public String getServiceReferenceBName() {
+        ServiceReference<BService> bSR = componentContext.getServiceReference(BService.class, "bReference");
+        return bSR.getService().getBName();
+    }
+
+    public String getSelfReferenceName() {
+        ServiceReference<AComponent> aSR = componentContext.createSelfReference(AComponent.class);
+        return aSR.getService().getName();
+    }
+
+    public String getProperty() {
+        return componentContext.getProperty(String.class, "aProperty");
+    }
+
+    public String getRequestContextServiceName() {
+        return componentContext.getRequestContext().getServiceName();
+    }
+
+    public String getCastCallableReferenceServiceName() {
+        BService b = componentContext.getService(BService.class, "bReference");
+        CallableReference<BService> bCR = componentContext.cast(b);
+        return bCR.getService().getBName();
+    }
+
+    public String getCastServiceReferenceServiceName() {
+        BService b = componentContext.getService(BService.class, "bReference");
+        ServiceReference<BService> bSR = componentContext.cast(b);
+        return bSR.getService().getBName();
+    }
+
+    public void illegalCast() {
+        componentContext.cast("");
+    }
+
+    public String testServiceLookup() {
+        return componentContext.getService(DComponent.class, "dReference").getName();
+    }
+
+    public String getRequestContextContent() {
+        return rcContent;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
new file mode 100644
index 0000000000..71d2eade2b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
@@ -0,0 +1,52 @@
+/*
+ * 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.apis.componentcontext.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.BService;
+import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.CService;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Service;
+
+@Service(interfaces={BService.class, CService.class})
+public class BComponentImpl implements BService, CService {
+
+    protected ComponentContext componentContext;
+
+    @Context
+    public void setComponentContext(ComponentContext context) {
+        this.componentContext = context;
+    }
+
+    public String getBName() {
+        return "ServiceB";
+    }
+
+    public String getCName() {
+        return "ServiceC";
+    }
+
+    public String getSelfReferenceWithServiceName() {
+        ServiceReference<CService> cSR = componentContext.createSelfReference(CService.class, "CService");
+        return cSR.getService().getCName();
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
new file mode 100644
index 0000000000..4b2c8c183b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
@@ -0,0 +1,32 @@
+/*
+ * 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.apis.componentcontext.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.DComponent;
+import org.osoa.sca.annotations.Service;
+
+@Service(DComponent.class)
+public class DComponentImpl implements DComponent {
+
+    public String getName() {
+        return "ComponentD";
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
new file mode 100644
index 0000000000..19f110d5dc
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
@@ -0,0 +1,47 @@
+<?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"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://java-api-tests"
+	name="AB-Composite">
+
+    <component name="AComponent">
+	    <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.impl.AComponentImpl"/>
+	    <reference name="bReference" target="BComponent/BService"/>
+	    <reference name="dReference" target="DComponent"/>
+	    <property name="aProperty" type="xsd:string">PropertyA</property>
+     </component>
+     
+    <component name="AUnannotatedComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.impl.AUnannotatedComponentImpl"/>
+        <reference name="bReference" target="BComponent/BService"/>
+        <reference name="dReference" target="DComponent"/>
+        <property name="aProperty" type="xsd:string">PropertyA</property>
+     </component>     
+
+    <component name="BComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.impl.BComponentImpl"/>
+    </component>
+
+    <component name="DComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.componentcontext.impl.DComponentImpl"/>
+    </component>
+
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
new file mode 100644
index 0000000000..3f4150c64f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
@@ -0,0 +1,191 @@
+/*
+ * 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.apis.componentcontext;
+
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import org.osoa.sca.ServiceRuntimeException;
+
+/**
+ * This test class tests the ComponentContext interface described in 1.7.1 of
+ * the SCA Java Annotations & APIs Specification 1.0. Relevant sections of 1.4
+ * will also be covered here.
+ */
+public class ComponentContextTestCase {
+
+    protected static String compositeName = "ab.composite";
+    protected static AComponent a;
+    protected static AComponent aUnannotated;
+    protected static BService b;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        try {
+            System.out.println("Setting up");
+            ServiceFinder.init(compositeName);
+            a = ServiceFinder.getService(AComponent.class, "AComponent");
+            aUnannotated = ServiceFinder.getService(AComponent.class, "AUnannotatedComponent");
+            b = ServiceFinder.getService(BService.class, "BComponent/BService");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void destroy() throws Exception {
+        System.out.println("Cleaning up");
+        ServiceFinder.cleanup();
+    }
+
+    /**
+     * Lines 776 <br>
+     * getURI() - Returns the absolute URI of the component within the SCA
+     * domain.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testGetURI() throws Exception {
+        Assert.assertEquals("AComponent", a.getContextURI());
+        Assert.assertEquals("AUnannotatedComponent", aUnannotated.getContextURI());
+    }
+
+    /**
+     * Lines 778 <br>
+     * getService(Class&lt;B&gt; businessInterface, String referenceName) ?
+     * Returns a proxy for the reference defined by the current component.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testGetService() throws Exception {
+        Assert.assertEquals(a.getServiceBName(), "ServiceB");
+    }
+
+    /**
+     * Lines 780 <br>
+     * getServiceReference(Class&lt;B&gt; businessInterface, String
+     * referenceName) ? Returns a ServiceReference defined by the current
+     * component.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testGetServiceReference() throws Exception {
+        Assert.assertEquals(a.getServiceReferenceBName(), "ServiceB");
+    }
+
+    /**
+     * Lines 783 <br>
+     * createSelfReference(Class&lt;B&gt; businessInterface) ? Returns a
+     * ServiceReference that can be used to invoke this component over the
+     * designated service.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testCreateSelfReference() throws Exception {
+        Assert.assertEquals(a.getSelfReferenceName(), "ComponentA");
+    }
+
+    /**
+     * Lines 785 <br>
+     * getSelfReference(Class&lt;B&gt; businessInterface, String serviceName) -
+     * Returns a ServiceReference that can be used to invoke this component over
+     * the designated service. Service name explicitly declares the service name
+     * to invoke.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testCreateSelfReferenceWithServiceName() throws Exception {
+        Assert.assertEquals("ServiceC", b.getSelfReferenceWithServiceName());
+    }
+
+    /**
+     * Lines 788 <br>
+     * getProperty (Class&lt;B&gt; type, String propertyName) - Returns the
+     * value of an SCA property defined by this component.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testGetProperty() throws Exception {
+        Assert.assertEquals("PropertyA", a.getProperty());
+    }
+
+    /**
+     * Lines 793 <br>
+     * getRequestContext() - Returns the context for the current SCA service
+     * request, or null if there is no current request or if the context is
+     * unavailable.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testGetRequestContext() throws Exception {
+        Assert.assertEquals("AComponent", a.getRequestContextServiceName());
+        Assert.assertEquals("NotNull", a.getRequestContextContent());
+    }
+
+    /**
+     * Lines 790,794 <br>
+     * cast(B target) - Casts a type-safe reference to a CallableReference.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testCast() throws Exception {
+        Assert.assertEquals("ServiceB", a.getCastCallableReferenceServiceName());
+        Assert.assertEquals("ServiceB", a.getCastServiceReferenceServiceName());
+
+        String check = "";
+        try {
+            a.illegalCast();
+        } catch (IllegalArgumentException iae) {
+            check = "IllegalCast";
+        } catch (ServiceRuntimeException sre) {
+            if (sre.getCause() instanceof IllegalArgumentException) { 
+                check = "IllegalCast";
+            }
+        }
+        Assert.assertEquals("IllegalCast", check);
+    }
+
+    /**
+     * Lines 342-344 <br>
+     * When a component implementation needs access to a service where the
+     * reference to the service is not known at compile time, the reference can
+     * be located using the component?s ComponentContext.
+     * 
+     * @throws Exception
+     */
+    @Test
+    @Ignore("TUSCANY-2609")
+    public void testServiceLookup() throws Exception {
+        Assert.assertEquals("ComponentD", a.testServiceLookup());
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/pom.xml
new file mode 100644
index 0000000000..5051f3955f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/pom.xml
@@ -0,0 +1,45 @@
+<?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-apis</artifactId>
+        <version>1.5-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>vtest-java-api-apis-conversation</artifactId>
+    <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - APIs - 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>
+</project>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
new file mode 100644
index 0000000000..805c1f2750
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
@@ -0,0 +1,34 @@
+/*
+ * 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.apis.conversation;
+
+import org.osoa.sca.annotations.Conversational;
+
+/**
+ * Simple Service A.
+ */
+@Conversational
+public interface AComponent {
+
+    public String getName();
+
+    public void testConversation();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
new file mode 100644
index 0000000000..abd8602705
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.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.apis.conversation;
+
+import org.osoa.sca.annotations.Conversational;
+import org.osoa.sca.annotations.EndsConversation;
+
+/**
+ * Simple Service B.
+ */
+@Conversational
+public interface BComponent {
+
+    public String getName();
+    
+    public void testCustomConversationID();
+    public void testGeneratedConversationID(Object id);
+
+    @EndsConversation
+    public void endsConversation();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
new file mode 100644
index 0000000000..616155ccdf
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
@@ -0,0 +1,73 @@
+/*
+ * 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.apis.conversation.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.apis.conversation.AComponent;
+import org.apache.tuscany.sca.vtest.javaapi.apis.conversation.BComponent;
+import org.junit.Assert;
+import org.osoa.sca.CallableReference;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.Conversation;
+import org.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.ConversationID;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(AComponent.class)
+@Scope("CONVERSATION")
+public class AComponentImpl implements AComponent {
+
+    protected ComponentContext componentContext;
+    
+    @Reference
+    protected CallableReference<BComponent> bReference;
+
+    @ConversationID
+    protected String cid;
+
+    public String getName() {
+        return "ComponentA";
+    }
+
+    @Context
+    public void setComponentContext(ComponentContext context) {
+        this.componentContext = context;
+    }
+
+    public void testConversation() {
+        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
+        bSR.setConversationID("AConversationID");
+        bSR.getService().testCustomConversationID();
+
+        Conversation bc = bSR.getConversation();
+        Assert.assertEquals("AConversationID", bc.getConversationID());
+        bc.end();
+
+        Assert.assertEquals("ComponentB", bReference.getService().getName());
+        bReference.getService().testGeneratedConversationID(bReference.getConversation().getConversationID());
+        bReference.getConversation().end();
+
+        Assert.assertEquals(1, BComponentImpl.customInitCount);
+        Assert.assertEquals(1, BComponentImpl.customDestroyCount);
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
new file mode 100644
index 0000000000..66a3d3c72c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
@@ -0,0 +1,78 @@
+/*
+ * 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.apis.conversation.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.apis.conversation.BComponent;
+import org.junit.Assert;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.ConversationID;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(BComponent.class)
+@Scope("CONVERSATION")
+public class BComponentImpl implements BComponent {
+
+    public static int customInitCount = 0;
+    public static int customDestroyCount = 0;
+
+    protected ComponentContext componentContext;
+
+    @ConversationID
+    protected String cid;
+
+    @Context
+    public void setComponentContext(ComponentContext context) {
+        this.componentContext = context;
+    }
+
+    public String getName() {
+        return "ComponentB";
+    }
+
+    public void testCustomConversationID() {
+        Assert.assertEquals("AConversationID", cid);
+    }
+
+    public void testGeneratedConversationID(Object id) {
+        Assert.assertEquals(id.toString(), cid);
+    }
+    
+    public void endsConversation() {
+    }
+
+    @Init
+    public void initB() {
+        if (cid.equals("AConversationID")) {
+            customInitCount++;
+        }
+    }
+
+    @Destroy
+    public void destroyB() {
+        if (cid.equals("AConversationID")) {
+            customDestroyCount++;
+        }
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/resources/conversation.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
new file mode 100644
index 0000000000..87cab2f479
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
@@ -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"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://java-api-tests"
+	name="Conversation-Composite">
+
+    <component name="AComponent">
+	    <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.conversation.impl.AComponentImpl"/>
+	    <reference name="bReference" target="BComponent"/>
+     </component>
+
+    <component name="BComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.conversation.impl.BComponentImpl"/>
+    </component>
+
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
new file mode 100644
index 0000000000..9b46ac5e08
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
@@ -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.apis.conversation;
+
+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 Conversation interface described in 1.7.5 of the
+ * SCA Java Annotations & APIs Specification 1.0.
+ */
+public class ConversationTestCase {
+
+    protected static String compositeName = "conversation.composite";
+    protected static AComponent a;
+    protected static BComponent b;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        try {
+            System.out.println("Setting up");
+            ServiceFinder.init(compositeName);
+            a = ServiceFinder.getService(AComponent.class, "AComponent");
+            b = ServiceFinder.getService(BComponent.class, "BComponent");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void destroy() throws Exception {
+        System.out.println("Cleaning up");
+        ServiceFinder.cleanup();
+    }
+
+    /**
+     * Lines 941, 942 <br>
+     * getConversationID() – Returns the identifier for this conversation. If a
+     * user-defined identity had been supplied for this reference then its value
+     * will be returned; otherwise the identity generated by the system when the
+     * conversation was initiated will be returned. <br>
+     * end() – Ends this conversation.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testConversation() throws Exception {
+        a.testConversation();
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/pom.xml
new file mode 100644
index 0000000000..fc52b213ce
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/pom.xml
@@ -0,0 +1,45 @@
+<?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-apis</artifactId>
+        <version>1.5-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>vtest-java-api-apis-exception</artifactId>
+    <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - APIs - Exception</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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
new file mode 100644
index 0000000000..5c3755b19f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
@@ -0,0 +1,40 @@
+/*
+ * 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.apis.exception;
+
+import org.osoa.sca.annotations.Conversational;
+
+/**
+ * Simple Service A.
+ */
+@Conversational
+public interface AComponent {
+
+    public String getName();
+
+    public void testConversation();
+    public void testCallBack();
+
+    public boolean testServiceRuntimeException();
+    public boolean testServiceUnavailableException();
+
+    public boolean testCheckedException();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
new file mode 100644
index 0000000000..c1c1c6544c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
@@ -0,0 +1,26 @@
+/*
+ * 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.apis.exception;
+
+public interface BCallback {
+
+    public void processResults(String result);        
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
new file mode 100644
index 0000000000..6893a3b4b8
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
@@ -0,0 +1,35 @@
+/*
+ * 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.apis.exception;
+
+import org.osoa.sca.annotations.Callback;
+
+/**
+ * Simple Service B.
+ */
+@Callback(BCallback.class)
+public interface BComponent {
+
+    public String getName();
+    
+    public void testCallback();
+    public void testRedirectedCallback();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
new file mode 100644
index 0000000000..519e66f1ce
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
@@ -0,0 +1,34 @@
+/*
+ * 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.apis.exception;
+
+import org.osoa.sca.annotations.Conversational;
+
+/**
+ * Simple Service C.
+ */
+@Conversational
+public interface CComponent {
+
+    public String getName();
+
+    public void testConversation();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
new file mode 100644
index 0000000000..d0ef71a926
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
@@ -0,0 +1,33 @@
+/*
+ * 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.apis.exception;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Remote Service D.
+ */
+@Remotable
+public interface DComponent {
+
+    public String getName();
+    public void testException() throws DException;
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
new file mode 100644
index 0000000000..82873ed96d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
@@ -0,0 +1,30 @@
+/*
+ * 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.apis.exception;
+
+public class DException extends Exception {
+
+    private static final long serialVersionUID = -3819913841563109423L;
+
+    public DException(String message) {
+        super(message);
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
new file mode 100644
index 0000000000..b4d6e929c5
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
@@ -0,0 +1,128 @@
+/*
+ * 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.apis.exception.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.apis.exception.AComponent;
+import org.apache.tuscany.sca.vtest.javaapi.apis.exception.BComponent;
+import org.apache.tuscany.sca.vtest.javaapi.apis.exception.CComponent;
+import org.apache.tuscany.sca.vtest.javaapi.apis.exception.DComponent;
+import org.apache.tuscany.sca.vtest.javaapi.apis.exception.DException;
+import org.junit.Assert;
+import org.osoa.sca.CallableReference;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.ConversationEndedException;
+import org.osoa.sca.NoRegisteredCallbackException;
+import org.osoa.sca.ServiceReference;
+import org.osoa.sca.ServiceRuntimeException;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.ConversationID;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(AComponent.class)
+@Scope("CONVERSATION")
+public class AComponentImpl implements AComponent {
+
+    protected ComponentContext componentContext;
+    
+    @Reference
+    protected CallableReference<BComponent> bReference;
+
+    @Reference
+    protected ServiceReference<CComponent> cReference;
+
+    @Reference
+    protected ServiceReference<DComponent> dReference;
+
+    @ConversationID
+    protected String cid;
+
+    public String getName() {
+        return "ComponentA";
+    }
+
+    @Context
+    public void setComponentContext(ComponentContext context) {
+        this.componentContext = context;
+    }
+
+    public void testConversation() {
+        ServiceReference<CComponent> cSR = componentContext.getServiceReference(CComponent.class, "cReference");
+        cSR.setConversationID("AConversationID");
+        Assert.assertEquals("ComponentC", cSR.getService().getName());
+
+        try {
+            Thread.sleep(1100);
+            cSR.getService().testConversation();
+
+            Assert.fail();
+        } catch (InterruptedException ie) {
+            ie.printStackTrace();
+        } catch (ConversationEndedException cee) {
+            // Expected
+        }
+    }
+
+    public void testCallBack() {
+        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
+        bSR.setCallbackID("ComponentACallBack");
+
+        try {
+            bSR.getService().testCallback();
+            Assert.fail();
+        } catch (NoRegisteredCallbackException e) {
+            // Expected
+        }
+    }
+
+    public boolean testServiceRuntimeException() {
+        try {
+            componentContext.getServiceReference(BComponent.class, "dummyBReference").getService().getName();
+        } catch (ServiceRuntimeException sre) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public boolean testServiceUnavailableException() {
+        return false;
+    }
+
+    public boolean testCheckedException() {
+        try {
+            dReference.getService().testException();
+        } catch (DException e) {
+            if (e.getMessage().equals("ADException")) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Destroy
+    public void destroy() {
+        System.out.println("This is a Destroy of AComponent ..");
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
new file mode 100644
index 0000000000..245401e8aa
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
@@ -0,0 +1,64 @@
+/*
+ * 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.apis.exception.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.apis.exception.BCallback;
+import org.apache.tuscany.sca.vtest.javaapi.apis.exception.BComponent;
+import org.junit.Assert;
+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.Service;
+
+@Service(BComponent.class)
+public class BComponentImpl implements BComponent {
+
+    protected ComponentContext componentContext;
+    
+    @Callback
+    protected BCallback callback;
+
+    @Context
+    public void setComponentContext(ComponentContext context) {
+        this.componentContext = context;
+    }
+
+    public String getName() {
+        return "ComponentB";
+    }
+
+    public void testCallback() {
+        callback = componentContext.getRequestContext().getCallback();
+        callback.processResults("CallBackFromB");
+
+        CallableReference<BCallback> bCR = componentContext.getRequestContext().getCallbackReference();
+        Assert.assertEquals("ComponentACallBack", bCR.getCallbackID());
+    }
+
+    public void testRedirectedCallback() {
+        callback = componentContext.getRequestContext().getCallback();
+        callback.processResults("RedirectedCallBackFromB");
+
+        CallableReference<BCallback> bCR = componentContext.getRequestContext().getCallbackReference();
+        Assert.assertEquals("RedirectedCallBack", bCR.getCallbackID());
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
new file mode 100644
index 0000000000..2546548e1c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
@@ -0,0 +1,50 @@
+/*
+ * 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.apis.exception.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.apis.exception.CComponent;
+import org.junit.Assert;
+import org.osoa.sca.RequestContext;
+import org.osoa.sca.annotations.Context;
+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(CComponent.class)
+@Scope("CONVERSATION")
+@ConversationAttributes(maxIdleTime="1 seconds")
+public class CComponentImpl implements CComponent {
+
+    @Context
+    protected RequestContext requestContext;
+
+    @ConversationID
+    protected String cid;
+
+    public String getName() {
+        return "ComponentC";
+    }
+
+    public void testConversation() {
+        Assert.assertEquals("AConversationID", cid);
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
new file mode 100644
index 0000000000..1cbda7e10b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.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.apis.exception.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.apis.exception.DComponent;
+import org.apache.tuscany.sca.vtest.javaapi.apis.exception.DException;
+import org.osoa.sca.annotations.Service;
+
+@Service(DComponent.class)
+public class DComponentImpl implements DComponent {
+
+    public String getName() {
+        return "ComponentD";
+    }
+
+    public void testException() throws DException {
+        throw new DException("ADException");
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/resources/exception.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/resources/exception.composite
new file mode 100644
index 0000000000..5bd933ce96
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/resources/exception.composite
@@ -0,0 +1,44 @@
+<?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"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://java-api-tests"
+    name="Exception-Composite">
+
+    <component name="AComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.exception.impl.AComponentImpl"/>
+        <reference name="bReference" target="BComponent"/>
+        <reference name="cReference" target="CComponent"/>
+        <reference name="dReference" target="DComponent"/>
+    </component>
+
+    <component name="BComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.exception.impl.BComponentImpl"/>
+    </component>
+
+    <component name="CComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.exception.impl.CComponentImpl"/>
+    </component>
+
+    <component name="DComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.exception.impl.DComponentImpl"/>
+    </component>
+
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
new file mode 100644
index 0000000000..da7b1da0fa
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
@@ -0,0 +1,132 @@
+/*
+ * 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.apis.exception;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * This test class tests the Exceptions described in 1.7.6, 1.7.7, 1.7.8, and 1.7.9 of the SCA Java Annotations & APIs Specification 1.0.
+ * This also covers 1.5 of the specification. 
+ */
+public class ExceptionTestCase {
+
+    protected static SCADomain domain;
+    protected static String compositeName = "exception.composite";
+    protected static AComponent a;
+    protected static BComponent b;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        try {
+            System.out.println("Setting up");
+            domain = SCADomain.newInstance(compositeName);
+            a = domain.getService(AComponent.class, "AComponent");
+            b = domain.getService(BComponent.class, "BComponent");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void destroy() throws Exception {
+        System.out.println("Cleaning up");
+        if (domain != null) {
+            domain.close();
+        }
+    }
+
+    /**
+     * Lines 951 <br>
+     * NoRegisteredCallbackException.
+     *  
+     * @throws Exception
+     */
+    @Test
+    public void testNoRegisteredCallbackException() throws Exception {
+        a.testCallBack();
+    }
+
+    /**
+     * Lines 960 <br>
+     * ServiceRuntimeException - This exception signals problems in the management of SCA component execution.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testServiceRuntimeException() throws Exception {
+        Assert.assertTrue(a.testServiceRuntimeException());        
+    }
+
+    /**
+     * Lines 970 <br>
+     * ServiceUnavailableException – This exception signals problems in the interaction with remote services.
+     * 
+     * @throws Exception
+     */
+    @Test
+    //@Ignore
+    public void testServiceUnavailableException() throws Exception {
+        domain.getComponentManager().stopComponent("AComponent");
+
+        try {
+            a.getName();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        try {
+            AComponent ac = domain.getService(AComponent.class, "AComponent");
+            ac.getName();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        domain.getComponentManager().startComponent("AComponent");
+    }
+
+    /**
+     * Lines 983 <br>
+     * ConversationEndedException.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testConversationEndedException() throws Exception {
+        a.testConversation();
+    }
+
+    /**
+     * Lines 360-361 <br>
+     * Business exceptions are thrown by the implementation of the called service method,
+     * and are defined as checked exceptions on the interface that types the service.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testCheckedException() throws Exception {
+        Assert.assertTrue(a.testCheckedException());
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/pom.xml
new file mode 100644
index 0000000000..49c6ea589f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/pom.xml
@@ -0,0 +1,64 @@
+<?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>java-api-apis</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests - APIs</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>componentcontext</module>
+                <module>requestcontext</module>
+                <module>callablereference</module>
+                <module>servicereference</module>
+                <module>conversation</module>
+                <module>exception</module>
+          </modules>
+        </profile>
+    </profiles>
+</project>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/pom.xml
new file mode 100644
index 0000000000..13745080c7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/pom.xml
@@ -0,0 +1,45 @@
+<?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-apis</artifactId>
+        <version>1.5-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>vtest-java-api-apis-requestcontext</artifactId>
+    <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - APIs - RequestContext</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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
new file mode 100644
index 0000000000..6fec5cada3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
@@ -0,0 +1,35 @@
+/*
+ * 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.apis.requestcontext;
+
+/**
+ * Simple Service A.
+ */
+public interface AComponent {
+
+    public String getName();
+
+    public boolean isJAASSubject();
+    public String getServiceName();
+    public String getCallbackResult();
+    public String getServiceReferenceName();
+    public String getCallbackServiceReferenceName();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
new file mode 100644
index 0000000000..4dd2088f90
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
@@ -0,0 +1,27 @@
+/*
+ * 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.apis.requestcontext;
+
+public interface BCallback {
+
+    public String getCallbackName();
+    public void processResults(String result);        
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
new file mode 100644
index 0000000000..34f709d175
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
@@ -0,0 +1,35 @@
+/*
+ * 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.apis.requestcontext;
+
+import org.osoa.sca.annotations.Callback;
+
+/**
+ * Simple Service B.
+ */
+@Callback(BCallback.class)
+public interface BComponent {
+
+    public String getName();
+    
+    public void testCallback();
+    public String getServiceReferenceName();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
new file mode 100644
index 0000000000..c6fa589ed4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
@@ -0,0 +1,102 @@
+/*
+ * 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.apis.requestcontext.impl;
+
+import javax.security.auth.Subject;
+
+import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.AComponent;
+import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.BCallback;
+import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.BComponent;
+import org.osoa.sca.CallableReference;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+@Service(AComponent.class)
+public class AComponentImpl implements AComponent, BCallback {
+
+    private static Object monitor = new Object();
+    private static String returnMessage = null;
+    private static CallableReference<BCallback> cbCR;
+
+    protected ComponentContext componentContext;
+
+    @Reference
+    protected BComponent bReference;
+
+    public String getName() {
+        return "ComponentA";
+    }
+
+    @Context
+    public void setComponentContext(ComponentContext context) {
+        this.componentContext = context;
+    }
+
+    public boolean isJAASSubject() {
+        return componentContext.getRequestContext().getSecuritySubject() instanceof Subject;
+    }
+
+    public String getServiceName() {
+        return componentContext.getRequestContext().getServiceName();
+    }
+
+    public String getCallbackResult() {
+        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
+        String cbID = "ComponentACallBack";
+        bSR.setCallbackID(cbID);
+        bSR.getService().testCallback();
+
+        // Wait for 30s max.
+        int count = 0;
+        synchronized(monitor) {
+            while (returnMessage == null && count++ < 30) {
+                try {
+                    monitor.wait(1000L);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return returnMessage;
+    }
+
+    public void processResults(String result) {
+        returnMessage = result;
+        cbCR = componentContext.getRequestContext().getServiceReference();
+    }
+
+    public String getServiceReferenceName() {
+        CallableReference<AComponent> aCR = componentContext.getRequestContext().getServiceReference();
+        return aCR.getService().getName();
+    }
+
+    public String getCallbackServiceReferenceName() {
+        return cbCR.getService().getCallbackName();
+    }
+
+    public String getCallbackName() {
+        return "CallBackB";
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
new file mode 100644
index 0000000000..33ff829357
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
@@ -0,0 +1,61 @@
+/*
+ * 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.apis.requestcontext.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.BCallback;
+import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.BComponent;
+import org.junit.Assert;
+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.Service;
+
+@Service(BComponent.class)
+public class BComponentImpl implements BComponent {
+
+    protected ComponentContext componentContext;
+    
+    @Callback
+    protected BCallback callback;
+
+    @Context
+    public void setComponentContext(ComponentContext context) {
+        this.componentContext = context;
+    }
+
+    public String getName() {
+        return "ComponentB";
+    }
+
+    public void testCallback() {
+        callback = componentContext.getRequestContext().getCallback();
+        callback.processResults("CallBackFromB");
+
+        CallableReference<BCallback> bCR = componentContext.getRequestContext().getCallbackReference();
+        Assert.assertEquals("ComponentACallBack", bCR.getCallbackID());
+    }
+
+    public String getServiceReferenceName() {
+        CallableReference<BComponent> bCR = componentContext.getRequestContext().getServiceReference();
+        return bCR.getService().getName();
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
new file mode 100644
index 0000000000..4aa5eeb25a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
@@ -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"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://java-api-tests"
+	name="RequestContext-Composite">
+
+    <component name="AComponent">
+	    <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.impl.AComponentImpl"/>
+	    <reference name="bReference" target="BComponent"/>
+     </component>
+
+    <component name="BComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.impl.BComponentImpl"/>
+    </component>
+
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
new file mode 100644
index 0000000000..e3b761bd37
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
@@ -0,0 +1,109 @@
+/*
+ * 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.apis.requestcontext;
+
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * This test class tests the RequestContext interface described in 1.7.2 of the
+ * SCA Java Annotations & APIs Specification 1.0.
+ */
+public class RequestContextTestCase {
+
+    protected static String compositeName = "requestcontext.composite";
+    protected static AComponent a;
+    protected static BComponent b;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        try {
+            System.out.println("Setting up");
+            ServiceFinder.init(compositeName);
+            a = ServiceFinder.getService(AComponent.class, "AComponent");
+            b = ServiceFinder.getService(BComponent.class, "BComponent");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void destroy() throws Exception {
+        System.out.println("Cleaning up");
+        ServiceFinder.cleanup();
+    }
+
+    /**
+     * Lines 858 <br>
+     * getSecuritySubject() – Returns the JAAS Subject of the current request.
+     * 
+     * @throws Exception
+     */
+    @Ignore("TUSCANY-2608")
+    public void testGetSecuritySubject() throws Exception {
+        Assert.assertTrue(a.isJAASSubject());
+    }
+
+    /**
+     * Lines 860 <br>
+     * getServiceName() – Returns the name of the service on the Java
+     * implementation the request came in on.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testGetServiceName() throws Exception {
+        Assert.assertEquals("AComponent", a.getServiceName());
+    }
+
+    /**
+     * Lines 861, 862 <br>
+     * getCallbackReference() – Returns a callable reference to the callback as
+     * specified by the caller. getCallback() – Returns a proxy for the callback
+     * as specified by the caller.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testGetCallback() throws Exception {
+        Assert.assertEquals("CallBackFromB", a.getCallbackResult());
+    }
+
+    /**
+     * Lines 863 <br>
+     * getServiceReference() – When invoked during the execution of a service
+     * operation, this API MUST return a CallableReference that represents the
+     * service. When invoked during the execution of a callback operation, this
+     * API MUST return a CallableReference that represents the callback service.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testGetServiceReference() throws Exception {
+        Assert.assertEquals("ComponentA", a.getServiceReferenceName());
+        Assert.assertEquals("ComponentB", b.getServiceReferenceName());
+        Assert.assertEquals("CallBackB", a.getCallbackServiceReferenceName());
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/pom.xml
new file mode 100644
index 0000000000..9ac79a91e7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/pom.xml
@@ -0,0 +1,45 @@
+<?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-apis</artifactId>
+        <version>1.5-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>vtest-java-api-apis-servicereference</artifactId>
+    <name>Apache Tuscany SCA vTest Java APIs and Annotations Verification Tests - APIs - ServiceReference</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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
new file mode 100644
index 0000000000..a1745f400e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.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.apis.servicereference;
+
+import org.osoa.sca.annotations.Conversational;
+
+/**
+ * Simple Service A.
+ */
+@Conversational
+public interface AComponent {
+
+    public String getName();
+
+    public void testConversationID();
+    public String getCallbackResult();
+    public void redirectCallback();
+    public void testGetCallback();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
new file mode 100644
index 0000000000..f8c5c1272f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
@@ -0,0 +1,26 @@
+/*
+ * 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.apis.servicereference;
+
+public interface BCallback {
+
+    public void processResults(String result);        
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
new file mode 100644
index 0000000000..33a4d6edcc
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
@@ -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.apis.servicereference;
+
+import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.Conversational;
+
+/**
+ * Simple Service B.
+ */
+@Conversational
+@Callback(BCallback.class)
+public interface BComponent {
+
+    public String getName();
+    
+    public void testCallback();
+    public void testConversationID();
+    public void testRedirectedCallback();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
new file mode 100644
index 0000000000..28c90e2071
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
@@ -0,0 +1,27 @@
+/*
+ * 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.apis.servicereference;
+
+/**
+ * Simple Service C.
+ */
+public interface CComponent extends BCallback {
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
new file mode 100644
index 0000000000..545d037c53
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
@@ -0,0 +1,119 @@
+/*
+ * 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.apis.servicereference.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.AComponent;
+import org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.BCallback;
+import org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.BComponent;
+import org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.CComponent;
+import org.junit.Assert;
+import org.osoa.sca.CallableReference;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.ConversationID;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(AComponent.class)
+@Scope("CONVERSATION")
+public class AComponentImpl implements AComponent, BCallback {
+
+    private static Object monitor = new Object();
+    private static String returnMessage = null;
+
+    protected ComponentContext componentContext;
+    
+    @Reference
+    protected CallableReference<BComponent> bReference;
+
+    @Reference
+    protected ServiceReference<CComponent> cReference;
+
+    @ConversationID
+    protected String cid;
+
+    public String getName() {
+        return "ComponentA";
+    }
+
+    @Context
+    public void setComponentContext(ComponentContext context) {
+        this.componentContext = context;
+    }
+
+    public void testConversationID() {
+        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
+        bSR.setConversationID("AConversationID");
+        bSR.getService().testConversationID();
+
+        Assert.assertEquals("AConversationID", bSR.getConversation().getConversationID());
+    }
+
+    public String getCallbackResult() {
+        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
+        String cbID = "ComponentACallBack";
+        bSR.setCallbackID(cbID);
+        bSR.getService().testCallback();
+
+        // Wait for 30s max.
+        int count = 0;
+        synchronized(monitor) {
+            while (returnMessage == null && count++ < 30) {
+                try {
+                    monitor.wait(1000L);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return returnMessage;
+    }
+
+    public void processResults(String result) {
+        returnMessage = result;
+    }
+
+    public void redirectCallback() {
+        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
+        bSR.setCallbackID("RedirectedCallBack");
+        bSR.setCallback(cReference);
+        bSR.getService().testRedirectedCallback();
+    }
+
+    public void testGetCallback() {
+        ServiceReference<BComponent> bSR = componentContext.getServiceReference(BComponent.class, "bReference");
+        bSR.setCallback(cReference);
+        Assert.assertEquals(cReference, bSR.getCallback());
+
+        TestObject aCallback = new TestObject();
+        bSR.setCallback(aCallback);
+        Assert.assertEquals(aCallback, bSR.getCallback());
+        Assert.assertEquals(1, ((TestObject) bSR.getCallback()).getId());
+
+        TestObject bCallback = new TestObject();
+        bSR.setCallback(bCallback);
+        Assert.assertEquals(bCallback, bSR.getCallback());
+        Assert.assertEquals(2, ((TestObject) bSR.getCallback()).getId());
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
new file mode 100644
index 0000000000..f4307667b6
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
@@ -0,0 +1,74 @@
+/*
+ * 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.apis.servicereference.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.BCallback;
+import org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.BComponent;
+import org.junit.Assert;
+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.ConversationID;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(BComponent.class)
+@Scope("CONVERSATION")
+public class BComponentImpl implements BComponent {
+
+    protected ComponentContext componentContext;
+    
+    @Callback
+    protected BCallback callback;
+
+    @ConversationID
+    protected String cid;
+
+    @Context
+    public void setComponentContext(ComponentContext context) {
+        this.componentContext = context;
+    }
+
+    public String getName() {
+        return "ComponentB";
+    }
+
+    public void testCallback() {
+        callback = componentContext.getRequestContext().getCallback();
+        callback.processResults("CallBackFromB");
+
+        CallableReference<BCallback> bCR = componentContext.getRequestContext().getCallbackReference();
+        Assert.assertEquals("ComponentACallBack", bCR.getCallbackID());
+    }
+
+    public void testConversationID() {
+        Assert.assertEquals("AConversationID", cid);
+    }
+
+    public void testRedirectedCallback() {
+        callback = componentContext.getRequestContext().getCallback();
+        callback.processResults("RedirectedCallBackFromB");
+
+        CallableReference<BCallback> bCR = componentContext.getRequestContext().getCallbackReference();
+        Assert.assertEquals("RedirectedCallBack", bCR.getCallbackID());
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
new file mode 100644
index 0000000000..099655ea22
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
@@ -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.apis.servicereference.impl;
+
+import org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.CComponent;
+import org.junit.Assert;
+import org.osoa.sca.RequestContext;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Service;
+
+@Service(CComponent.class)
+public class CComponentImpl implements CComponent {
+
+    @Context
+    protected RequestContext requestContext;
+
+    public void processResults(String result) {
+        Assert.assertEquals("RedirectedCallBackFromB", result);
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java
new file mode 100644
index 0000000000..ba3edf13ae
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.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.apis.servicereference.impl;
+
+public class TestObject {
+
+    public static int count = 0;
+
+    private int id;
+
+    public TestObject() {
+        count++;
+        id = count;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
new file mode 100644
index 0000000000..9bded61947
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
@@ -0,0 +1,39 @@
+<?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"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://java-api-tests"
+	name="ServiceReference-Composite">
+
+    <component name="AComponent">
+	    <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.impl.AComponentImpl"/>
+	    <reference name="bReference" target="BComponent"/>
+	    <reference name="cReference" target="CComponent"/>
+     </component>
+
+    <component name="BComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.impl.BComponentImpl"/>
+    </component>
+
+    <component name="CComponent">
+        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.apis.servicereference.impl.CComponentImpl"/>
+    </component>
+
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
new file mode 100644
index 0000000000..fda917d60a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
@@ -0,0 +1,106 @@
+/*
+ * 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.apis.servicereference;
+
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * This test class tests the ServiceReference interface described in 1.7.4 of
+ * the SCA Java Annotations & APIs Specification 1.0.
+ */
+public class ServiceReferenceTestCase {
+
+    protected static String compositeName = "servicereference.composite";
+    protected static AComponent a;
+    protected static BComponent b;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        try {
+            System.out.println("Setting up");
+            ServiceFinder.init(compositeName);
+            a = ServiceFinder.getService(AComponent.class, "AComponent");
+            b = ServiceFinder.getService(BComponent.class, "BComponent");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void destroy() throws Exception {
+        System.out.println("Cleaning up");
+        ServiceFinder.cleanup();
+    }
+
+    /**
+     * Lines 915-916 <br>
+     * getConversationID() - Returns the id supplied by the user that will be
+     * associated with conversations initiated through this reference. <br>
+     * setConversationID(Object conversationId) – Set the id to associate with
+     * any conversation started through this reference. If the value supplied is
+     * null then the id will be generated by the implementation. Throws an
+     * IllegalStateException if a conversation is currently associated with this
+     * reference.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testConversationID() throws Exception {
+        a.testConversationID();
+    }
+
+    /**
+     * Lines 917 <br>
+     * setCallbackID(Object callbackID) – Sets the callback ID.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testSetCallbackID() throws Exception {
+        Assert.assertEquals("CallBackFromB", a.getCallbackResult());
+    }
+
+    /**
+     * Lines 918 <br>
+     * getCallback() – Returns the callback object.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testGetCallback() throws Exception {
+        a.testGetCallback();
+    }
+
+    /**
+     * Lines 919 <br>
+     * setCallback(Object callback) – Sets the callback object.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testSetCallback() throws Exception {
+        a.redirectCallback();
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/pom.xml
new file mode 100644
index 0000000000..f98781c7db
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/pom.xml
@@ -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>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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
new file mode 100644
index 0000000000..e78736d4df
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
@@ -0,0 +1,30 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
new file mode 100644
index 0000000000..0a90f9c99a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
@@ -0,0 +1,33 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
new file mode 100644
index 0000000000..0e61247294
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
@@ -0,0 +1,40 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
new file mode 100644
index 0000000000..e317a6e7e0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
@@ -0,0 +1,33 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
new file mode 100644
index 0000000000..6446e006bd
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
@@ -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.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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
new file mode 100644
index 0000000000..15672f9ee0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
@@ -0,0 +1,32 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
new file mode 100644
index 0000000000..400c696d82
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
@@ -0,0 +1,33 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
new file mode 100644
index 0000000000..33421cb4d0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
@@ -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.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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
new file mode 100644
index 0000000000..1b220abf69
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
@@ -0,0 +1,67 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
new file mode 100644
index 0000000000..957957a2e4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
@@ -0,0 +1,60 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
new file mode 100644
index 0000000000..4ef741c1c1
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
@@ -0,0 +1,33 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
new file mode 100644
index 0000000000..bba4bf2611
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
@@ -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.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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
new file mode 100644
index 0000000000..4fb4fa53de
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
@@ -0,0 +1,35 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
new file mode 100644
index 0000000000..83453397b2
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
@@ -0,0 +1,61 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java
new file mode 100644
index 0000000000..c165aa51da
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java
@@ -0,0 +1,49 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
new file mode 100644
index 0000000000..c0440a2b1b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
@@ -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.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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
new file mode 100644
index 0000000000..8a237af0ad
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
@@ -0,0 +1,33 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
new file mode 100644
index 0000000000..9c185ddee3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
@@ -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.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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
new file mode 100644
index 0000000000..2e79d135f4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
@@ -0,0 +1,73 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
new file mode 100644
index 0000000000..fb0d6b8a50
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
@@ -0,0 +1,60 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
new file mode 100644
index 0000000000..1ace5858b2
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
@@ -0,0 +1,61 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
new file mode 100644
index 0000000000..52d8fe5a7e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
@@ -0,0 +1,73 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
new file mode 100644
index 0000000000..eea769b2fb
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
@@ -0,0 +1,49 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
new file mode 100644
index 0000000000..1caa467348
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
@@ -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.callback.local;
+
+import org.osoa.sca.annotations.Conversational;
+
+/**
+ *
+ */
+@Conversational
+public interface AServiceCallback {
+
+    public void callBack(String someState);
+    
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
new file mode 100644
index 0000000000..a7f471aa26
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
@@ -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.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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
new file mode 100644
index 0000000000..4aeeca6dc3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
@@ -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.callback.local;
+
+import org.osoa.sca.annotations.Conversational;
+
+/**
+ * Simple Service
+ */
+@Conversational
+public interface BServiceCallback {
+
+    public void callBack(String someState);
+    
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
new file mode 100644
index 0000000000..014f1edd33
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
@@ -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.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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
new file mode 100644
index 0000000000..4e6dce6fb9
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
@@ -0,0 +1,61 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
new file mode 100644
index 0000000000..2f560fe87b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
@@ -0,0 +1,73 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java
new file mode 100644
index 0000000000..23e0d0e70b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java
@@ -0,0 +1,49 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
new file mode 100644
index 0000000000..16b2932afc
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
@@ -0,0 +1,33 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
new file mode 100644
index 0000000000..56b7006581
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
@@ -0,0 +1,33 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
new file mode 100644
index 0000000000..580cf5a612
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
@@ -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.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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
new file mode 100644
index 0000000000..144492984a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
@@ -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.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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
new file mode 100644
index 0000000000..ce7214dba1
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
@@ -0,0 +1,79 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
new file mode 100644
index 0000000000..b61a15cbee
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
@@ -0,0 +1,64 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
new file mode 100644
index 0000000000..cb9aee2b9f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
@@ -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.callback.stateless;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Service
+ */
+@Remotable
+public interface BServiceCallback {
+
+    public void callBack(String someState);
+    
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
new file mode 100644
index 0000000000..1fe70344af
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
@@ -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.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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
new file mode 100644
index 0000000000..033fa9d097
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
@@ -0,0 +1,73 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
new file mode 100644
index 0000000000..5f7d8d9c94
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
@@ -0,0 +1,81 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
new file mode 100644
index 0000000000..47d5d53821
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
@@ -0,0 +1,74 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java
new file mode 100644
index 0000000000..18ce5edebe
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java
@@ -0,0 +1,49 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
new file mode 100644
index 0000000000..802c9c30db
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
@@ -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="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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
new file mode 100644
index 0000000000..e66ea5d537
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
@@ -0,0 +1,40 @@
+<?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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
new file mode 100644
index 0000000000..4d93d2279d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
@@ -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="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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
new file mode 100644
index 0000000000..cd8c589a59
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
@@ -0,0 +1,40 @@
+<?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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
new file mode 100644
index 0000000000..6c69330ce5
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
@@ -0,0 +1,35 @@
+<?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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
new file mode 100644
index 0000000000..72c08e8344
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
@@ -0,0 +1,40 @@
+<?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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
new file mode 100644
index 0000000000..144f7f3d00
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
@@ -0,0 +1,40 @@
+<?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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
new file mode 100644
index 0000000000..ace06b245c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
@@ -0,0 +1,41 @@
+<?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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback.composite
new file mode 100644
index 0000000000..4623f17ca2
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback.composite
@@ -0,0 +1,40 @@
+<?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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
new file mode 100644
index 0000000000..bd8f116c10
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
@@ -0,0 +1,358 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/pom.xml
new file mode 100644
index 0000000000..a582913c54
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/pom.xml
@@ -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>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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
new file mode 100644
index 0000000000..e78736d4df
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
@@ -0,0 +1,30 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
new file mode 100644
index 0000000000..0a90f9c99a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
@@ -0,0 +1,33 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
new file mode 100644
index 0000000000..0e61247294
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
@@ -0,0 +1,40 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
new file mode 100644
index 0000000000..e317a6e7e0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
@@ -0,0 +1,33 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
new file mode 100644
index 0000000000..15672f9ee0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
@@ -0,0 +1,32 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
new file mode 100644
index 0000000000..1ace5858b2
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
@@ -0,0 +1,61 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
new file mode 100644
index 0000000000..705e101a01
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
@@ -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.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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
new file mode 100644
index 0000000000..c03b1aedc4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
@@ -0,0 +1,73 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java
new file mode 100644
index 0000000000..8e068c8be4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java
@@ -0,0 +1,49 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/resources/callback-mixed.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/resources/callback-mixed.composite
new file mode 100644
index 0000000000..ff6e0b63b2
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/resources/callback-mixed.composite
@@ -0,0 +1,38 @@
+<?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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
new file mode 100644
index 0000000000..2bc5f6c910
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
@@ -0,0 +1,73 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/pom.xml
new file mode 100644
index 0000000000..b9a738f731
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/pom.xml
@@ -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>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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
new file mode 100644
index 0000000000..f49952828c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
@@ -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/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
new file mode 100644
index 0000000000..d4641c5ee6
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
@@ -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/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
new file mode 100644
index 0000000000..66a9b3b6c3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
@@ -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/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
new file mode 100644
index 0000000000..ac40c56ee6
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
@@ -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/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
new file mode 100644
index 0000000000..517976ff73
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
@@ -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<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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
new file mode 100644
index 0000000000..752476ebf7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
@@ -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/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
new file mode 100644
index 0000000000..a01ceb7be4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
@@ -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/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
new file mode 100644
index 0000000000..25e7154fca
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
@@ -0,0 +1,40 @@
+<?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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
new file mode 100644
index 0000000000..d3cb107a61
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
@@ -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
+     * <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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/pom.xml
new file mode 100644
index 0000000000..d4b4927e94
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/pom.xml
@@ -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>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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
new file mode 100644
index 0000000000..8deef5df31
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
@@ -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.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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
new file mode 100644
index 0000000000..5a20f4d960
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
@@ -0,0 +1,35 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
new file mode 100644
index 0000000000..6368b1157b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
@@ -0,0 +1,47 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
new file mode 100644
index 0000000000..ab186ee7eb
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
@@ -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.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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
new file mode 100644
index 0000000000..dcc2e5d9c4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
@@ -0,0 +1,34 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
new file mode 100644
index 0000000000..06d40accd4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
@@ -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.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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
new file mode 100644
index 0000000000..56bfcabfc4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
@@ -0,0 +1,197 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
new file mode 100644
index 0000000000..0919734c7a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
@@ -0,0 +1,64 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
new file mode 100644
index 0000000000..d9910d445c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
@@ -0,0 +1,40 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
new file mode 100644
index 0000000000..34c57e402e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
@@ -0,0 +1,78 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
new file mode 100644
index 0000000000..21ee8acac1
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
@@ -0,0 +1,45 @@
+<?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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
new file mode 100644
index 0000000000..987ac3539f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
@@ -0,0 +1,216 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/pom.xml
new file mode 100644
index 0000000000..f4dafbbe80
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/pom.xml
@@ -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>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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
new file mode 100644
index 0000000000..bd19b504d9
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
@@ -0,0 +1,28 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
new file mode 100644
index 0000000000..8a5ef43a4b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
@@ -0,0 +1,34 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
new file mode 100644
index 0000000000..e9a6dc469d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
@@ -0,0 +1,32 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
new file mode 100644
index 0000000000..0ef2f219f7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
@@ -0,0 +1,47 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
new file mode 100644
index 0000000000..ab0b05d163
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
@@ -0,0 +1,40 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
new file mode 100644
index 0000000000..27d0210fca
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
@@ -0,0 +1,44 @@
+/*
+ * 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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
new file mode 100644
index 0000000000..a8500dfb09
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
@@ -0,0 +1,40 @@
+<?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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
new file mode 100644
index 0000000000..929fe06115
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
@@ -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.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/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/pom.xml
new file mode 100644
index 0000000000..5c8ee059cb
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/pom.xml
@@ -0,0 +1,64 @@
+<?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>
diff --git a/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/pom.xml
new file mode 100644
index 0000000000..6bbf747528
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/pom.xml
@@ -0,0 +1,70 @@
+<?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>tuscany-vtest</artifactId>
+        <version>1.5-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>vtest-java-api</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Tuscany SCA Java APIs and Annotations Verification Tests</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>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>vtest-utilities</artifactId>
+            <version>1.5-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+    </dependencies>
+
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>annotations</module>
+                <module>apis</module>
+                <module>conversation</module>
+           </modules>
+        </profile>
+    </profiles>
+
+</project>