Moving 2.x contribs

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

15 files changed, 1190 insertions, 0 deletions

diff --git a/sca-java-2.x/contrib/itest/serialization/pom.xml b/sca-java-2.x/contrib/itest/serialization/pom.xml
new file mode 100644
index 0000000000..625bcf4154
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/serialization/pom.xml
@@ -0,0 +1,66 @@
+<?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-itest</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-serialization</artifactId>
+    <name>Apache Tuscany SCA Serialization Integration Tests</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>       
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>  
+           
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>         
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-axis2</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
new file mode 100644
index 0000000000..3c643436e9
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.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.itest.servicereference;
+
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Conversational;
+
+/**
+ * A very simple Conversational Service
+ *
+ * @version $Date$ $Revision$
+ */
+@Conversational
+@Callback(ConversationalServiceCallback.class)
+public interface ConversationalService {
+
+    /**
+     * Default value for the user data
+     * 
+     * @See {@link #getUserData()}
+     * @See {@link #setUserData(String)}
+     */
+    String DEFAULT_USER_DATA = "NOT SET";
+
+    /**
+     * Retrieves the conversation ID for this Service
+     * 
+     * @return The conversation ID for this Service
+     */
+    Object getConversationID();
+
+    /**
+     * Creates a self reference to this Service
+     * 
+     * @return A self reference to this Service
+     */
+    ServiceReference<ConversationalService> createSelfRef();
+
+    /**
+     * Sets some user data on the instance
+     * 
+     * @param a_Data Some data
+     * 
+     * @See {@link #getUserData()}
+     */
+    void setUserData(String a_Data);
+
+    /**
+     * Gets some user data on the instance
+     * 
+     * @return Some data
+     * 
+     * @See {@link #setUserData(String)}
+     */
+    String getUserData();
+
+    /**
+     * Method that triggers the callback.
+     * 
+     * @param msg A message to pass with the callback
+     * @throws Exception Test failed
+     */
+    void triggerCallback(String msg) throws Exception;
+}
diff --git a/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
new file mode 100644
index 0000000000..4d75c68c2d
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.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.itest.servicereference;
+
+import org.oasisopen.sca.annotation.Conversational;
+
+/**
+ * This is the callback for the ConversationalService.
+ *
+ * @version $Rev$ $Date$
+ */
+@Conversational
+public interface ConversationalServiceCallback {
+
+    /**
+     * Simple callback method.
+     * 
+     * @param msg The message for the call back
+     */
+    void callback(String msg);
+}
diff --git a/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
new file mode 100644
index 0000000000..b129cbc4b7
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.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.itest.servicereference;
+
+import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils;
+import org.junit.Assert;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.ConversationID;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
+
+/**
+ * Simple conversational Service implementation
+ * 
+ * @version $Date$ $Revision$
+ */
+@Service(ConversationalService.class)
+@Scope("CONVERSATION")
+public class ConversationalServiceImpl implements ConversationalService {
+
+    /**
+     * The Conversation ID
+     */
+    private Object m_ConversationID;
+
+    /**
+     * Injected reference to the call back.
+     */
+    @Callback
+    protected CallableReference<ConversationalServiceCallback> theCallbackRef;
+
+    /**
+     * Injected reference to the ComponentContext.
+     */
+    @Context
+    protected ComponentContext m_Ctx;
+
+    /**
+     * Some user data
+     */
+    private String m_UserData = DEFAULT_USER_DATA;
+
+    /**
+     * Constructor
+     */
+    public ConversationalServiceImpl() {
+    }
+
+    /**
+     * Used to inject the Conversation ID
+     * 
+     * @param a_ConversationID the Conversation ID
+     */
+    @ConversationID
+    public void setConversationID(Object a_ConversationID) {
+        m_ConversationID = a_ConversationID;
+    }
+
+    /**
+     * Retrieves the conversation ID for this Service
+     * 
+     * @return The conversation ID for this Service
+     */
+    public Object getConversationID() {
+        return m_ConversationID;
+    }
+
+    /**
+     * Creates a self reference to this Service
+     * 
+     * @return A self reference to this Service
+     */
+    public ServiceReference<ConversationalService> createSelfRef() {
+        return m_Ctx.createSelfReference(ConversationalService.class);
+    }
+
+    /**
+     * Sets some user data on the instance
+     * 
+     * @param a_Data Some data
+     * 
+     * @See {@link #getUserData()}
+     */
+    public void setUserData(String a_Data) {
+        m_UserData = a_Data;
+    }
+
+    /**
+     * Gets some user data on the instance
+     * 
+     * @return Some data
+     * 
+     * @See {@link #setUserData(String)}
+     */
+    public String getUserData() {
+        return m_UserData;
+    }
+
+    /**
+     * Method that triggers the callback.
+     * 
+     * @param msg A message to pass with the callback
+     * @throws Exception Test failed
+     */
+    public void triggerCallback(String msg) throws Exception {
+        Assert.assertNotNull(theCallbackRef);
+
+        // Serialize the CallableReference
+        byte[] serializedCR = ServiceReferenceUtils.serialize(theCallbackRef);
+        Assert.assertNotNull(serializedCR);
+
+        // Deserlaize the CallableReference
+        CallableReference<?> cr = ServiceReferenceUtils.deserializeCallableReference(serializedCR);
+        Assert.assertNotNull(cr);
+        CallableReference<ConversationalServiceCallback> regotCallbackRef 
+            = (CallableReference<ConversationalServiceCallback>) cr;
+
+        // Use the deseralized CallbackReference
+        regotCallbackRef.getService().callback(msg);
+    }
+}
diff --git a/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
new file mode 100644
index 0000000000..c268f9bda7
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.itest.servicereference;
+
+
+/**
+ * This is a test client that is used to test Serializing and Deserializing
+ * ServiceReferences within a SCA Application
+ * 
+ * @version $Date$ $Revision$
+ */
+public interface SCAManagedClient {
+
+    /**
+     * Tests Serializing a Stateless ServiceReference
+     * 
+     * @throws Exception Test failed
+     */
+    void testSerializeStatelessServiceReference() throws Exception;
+
+    /**
+     * Tests Serializing a Nested Stateless ServiceReference.
+     * 
+     * @throws Exception Test failed
+     */
+    void testSerializeNestedStatelessServiceReference() throws Exception;
+
+    /**
+     * Tests Serializing a Callback to a Stateless Service as managed
+     * SCA code
+     * 
+     * @throws Exception Test failed
+     */
+    void testSerializeCallbackToStatelessServiceInsideSCA() throws Exception;
+}
diff --git a/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
new file mode 100644
index 0000000000..64c5e7e631
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.itest.servicereference;
+
+import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils;
+import org.junit.Assert;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
+
+/**
+ * This is a test client that is used to test Serializing and Deserializing
+ * ServiceReferences within a SCA Application
+ * 
+ * @version $Date$ $Revision$
+ */
+@Service(SCAManagedClient.class)
+public class SCAManagedClientImpl implements SCAManagedClient, StatelessServiceCallback {
+
+    /**
+     * Injected reference to the StatelessService
+     */
+    @Reference(name = "statelessService")
+    protected ServiceReference<StatelessService> statelessServiceRef;
+
+    /**
+     * Injected reference to the Nested StatelessService.
+     */
+    @Reference(name = "nestedStatelessService")
+    protected ServiceReference<StatelessService> nestedStatelessServiceRef;
+
+    /**
+     * Tests Serializing a Stateless ServiceReference
+     * 
+     * @throws Exception Test failed
+     */
+    public void testSerializeStatelessServiceReference() throws Exception {
+        doTestSerializeStatelessServiceReference(statelessServiceRef);
+    }
+    
+    /**
+     * Tests Serializing a Nested Stateless ServiceReference.
+     * 
+     * @throws Exception Test failed
+     */
+    public void testSerializeNestedStatelessServiceReference() throws Exception {
+        doTestSerializeStatelessServiceReference(nestedStatelessServiceRef);
+    }
+
+    /**
+     * Tests Serializing a Stateless ServiceReference.
+     * 
+     * @throws Exception Test failed
+     */
+    private void doTestSerializeStatelessServiceReference(
+            ServiceReference<StatelessService> aServiceRef) throws Exception {
+        Assert.assertNotNull(aServiceRef);
+
+        StatelessService service = aServiceRef.getService();
+        service.getCurrentTime();
+        
+        // Serialize the ServiceReference
+        byte[] serializedSR = ServiceReferenceUtils.serialize(aServiceRef);
+        Assert.assertNotNull(serializedSR);
+
+        // Deserialize the ServiceReference
+        ServiceReference<?> deserializedSR = ServiceReferenceUtils.deserializeServiceReference(serializedSR);
+        Assert.assertNotNull(deserializedSR);
+        ServiceReference<StatelessService> regotServiceRef = (ServiceReference<StatelessService>) deserializedSR;
+        Assert.assertNotNull(regotServiceRef);
+
+        // Use the ServiceReference to access the Service.
+        StatelessService regotService = regotServiceRef.getService();
+        Assert.assertNotNull(regotService);
+    }
+
+    /**
+     * Simple callback method
+     * 
+     * @param msg The call back message
+     */
+    public void callback(String msg) {
+        System.out.println("Stateless Callback with message " + msg);
+    }
+    
+    /**
+     * Tests Serializing a Callback to a Stateless Service as managed
+     * SCA code
+     * 
+     * @throws Exception Test failed
+     */
+    public void testSerializeCallbackToStatelessServiceInsideSCA() throws Exception {
+        Assert.assertNotNull(statelessServiceRef);
+
+        StatelessService service = statelessServiceRef.getService();
+        String msg = "A message for the callback " + System.currentTimeMillis();
+        service.triggerCallback(msg);
+    }
+}
diff --git a/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
new file mode 100644
index 0000000000..b233241514
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.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.itest.servicereference;
+
+import org.oasisopen.sca.annotation.Conversational;
+
+
+/**
+ * This is a test client that is used to test Serializing and Deserializing
+ * ServiceReferences within a SCA Application where the client that the Callback
+ * is referring is actually Conversational.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Conversational
+public interface SCAManagedConversationalClient {
+
+    /**
+     * Tests Serializing a Conversational ServiceReference.
+     * 
+     * @throws Exception Test failed
+     */
+    void testSerializeConversationalServiceReference() throws Exception;
+
+    /**
+     * Tests Serializing a Nested Conversational ServiceReference.
+     * 
+     * @throws Exception Test failed
+     */
+    void testSerializeNestedConversationalServiceReference() throws Exception;
+
+    /**
+     * Tests Serializing a Callback to a Conversational Service as managed
+     * SCA code.
+     * 
+     * @throws Exception Test failed
+     */
+    void testSerializeCallbackToConversationalServiceInsideSCA() throws Exception;
+}
diff --git a/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
new file mode 100644
index 0000000000..9e55eea7ee
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.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.itest.servicereference;
+
+import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils;
+import org.junit.Assert;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
+
+/**
+ * This is a test client that is used to test Serializing and Deserializing
+ * ServiceReferences within a SCA Application
+ * 
+ * @version $Rev$ $Date$
+ */
+@Service(SCAManagedConversationalClient.class)
+@Scope("CONVERSATION")
+public class SCAManagedConversationalClientImpl implements SCAManagedConversationalClient, ConversationalServiceCallback {
+
+    /**
+     * Injected reference to the ConversationalService.
+     */
+    @Reference(name = "conversationalService")
+    protected ServiceReference<ConversationalService> conversationalServiceRef;
+
+    /**
+     * Injected reference to the ConversationalService.
+     */
+    @Reference(name = "nestedConversationalService")
+    protected ServiceReference<ConversationalService> nestedConversationalServiceRef;
+
+    /**
+     * This is the message that we sent to the callback.
+     */
+    private String messageSentToCallback;
+
+    /**
+     * Tests Serializing a Conversational ServiceReference.
+     * 
+     * @throws Exception Test failed
+     */
+    public void testSerializeConversationalServiceReference() throws Exception {
+        doTestSerializeConversationalServiceReference(conversationalServiceRef);
+    }
+
+    /**
+     * Tests Serializing a Nested Conversational ServiceReference.
+     * 
+     * @throws Exception Test failed
+     */
+    public void testSerializeNestedConversationalServiceReference() throws Exception {
+        doTestSerializeConversationalServiceReference(nestedConversationalServiceRef);
+    }
+
+    /**
+     * Test Serializing a Conversational ServiceReference.
+     * 
+     * @param aServiceRef The Reference to Serialize
+     * @throws Exception Test failed.
+     */
+    private void doTestSerializeConversationalServiceReference(ServiceReference<ConversationalService> aServiceRef) throws Exception {
+        Assert.assertNotNull(aServiceRef);
+
+        ConversationalService service = aServiceRef.getService();
+        Object origConvID = service.getConversationID();
+        Assert.assertNotNull(origConvID);
+
+        // Serialize the ServiceReference
+        byte[] serializedSR = ServiceReferenceUtils.serialize(aServiceRef);
+        Assert.assertNotNull(serializedSR);
+
+        // Deserialize the ServiceReference
+        ServiceReference<?> deserializedSR = ServiceReferenceUtils.deserializeServiceReference(serializedSR);
+        Assert.assertNotNull(deserializedSR);
+        ServiceReference<ConversationalService> regotServiceRef = (ServiceReference<ConversationalService>) deserializedSR;
+        Assert.assertNotNull(regotServiceRef);
+
+        // Use the ServiceReference to access the Service.
+        ConversationalService regotService = regotServiceRef.getService();
+        Assert.assertNotNull(regotService);
+        Object regotConvID = regotService.getConversationID();
+        Assert.assertNotNull(regotConvID);
+
+        // Make sure we have the same Conversation ID
+        Assert.assertEquals(origConvID, regotConvID);
+    }
+
+
+    /**
+     * Tests Serializing a Callback to a Conversational Service as managed
+     * SCA code.
+     * 
+     * @throws Exception Test failed
+     */
+    public void testSerializeCallbackToConversationalServiceInsideSCA() throws Exception {
+        Assert.assertNotNull(conversationalServiceRef);
+
+        ConversationalService service = conversationalServiceRef.getService();
+        messageSentToCallback = "A message for the callback " + System.currentTimeMillis();
+        service.triggerCallback(messageSentToCallback);
+    }
+    
+    /**
+     * Simple callback method.
+     * 
+     * @param msg The call back message
+     */
+    public void callback(String msg) {
+        System.out.println("Stateless Callback with message " + msg);
+
+        // Make sure we received the message we expected
+        Assert.assertEquals(messageSentToCallback, msg);
+    }
+}
diff --git a/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
new file mode 100644
index 0000000000..804debf30c
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.itest.servicereference;
+
+import org.oasisopen.sca.annotation.Callback;
+
+
+/**
+ * A very simple Stateless Service
+ *
+ * @version $Date$ $Revision$
+ */
+@Callback(StatelessServiceCallback.class)
+public interface StatelessService {
+
+    /**
+     * Gets the current time
+     * 
+     * @return The current time
+     */
+    String getCurrentTime();
+
+    /**
+     * Method that triggers the callback
+     * 
+     * @param msg A message to pass with the callback
+     * @throws Exception Test failed
+     */
+    void triggerCallback(String msg) throws Exception;
+}
diff --git a/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
new file mode 100644
index 0000000000..ffe3a3b8ef
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.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.itest.servicereference;
+
+/**
+ * This is the callback for the StatelessService
+ *
+ * @version $Date$ $Revision$
+ */
+public interface StatelessServiceCallback {
+
+    /**
+     * Simple callback method
+     * 
+     * @param msg The message for the call back
+     */
+    void callback(String msg);
+}
diff --git a/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
new file mode 100644
index 0000000000..795f2d9c46
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.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.itest.servicereference;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils;
+import org.junit.Assert;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Service;
+
+/**
+ * Simple Stateless Service implementation
+ * 
+ * @version $Date$ $Revision$
+ */
+@Service(StatelessService.class)
+public class StatelessServiceImpl implements StatelessService {
+
+    /**
+     * Injected reference to the call back
+     */
+    @Callback
+    protected CallableReference<StatelessServiceCallback> theCallbackRef;
+
+    /**
+     * Constructor
+     */
+    public StatelessServiceImpl() {
+    }
+
+    /**
+     * Gets the current time
+     * 
+     * @return The current time
+     */
+    public String getCurrentTime() {
+        SimpleDateFormat sdf = new SimpleDateFormat();
+        return sdf.format(new Date());
+    }
+
+    /**
+     * Method that triggers the callback
+     * 
+     * @param msg A message to pass with the callback
+     * @throws Exception Test failed
+     */
+    public void triggerCallback(String msg) throws Exception {
+        Assert.assertNotNull(theCallbackRef);
+
+        // Serialize the CallableReference
+        byte[] serializedCR = ServiceReferenceUtils.serialize(theCallbackRef);
+        Assert.assertNotNull(serializedCR);
+
+        // Deserlaize the CallableReference
+        CallableReference<?> cr = ServiceReferenceUtils.deserializeCallableReference(serializedCR);
+        Assert.assertNotNull(cr);
+        CallableReference<StatelessServiceCallback> regotCallbackRef 
+            = (CallableReference<StatelessServiceCallback>) cr;
+
+        // Use the deseralized CallbackReference
+        regotCallbackRef.getService().callback(msg);
+    }
+}
diff --git a/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
new file mode 100644
index 0000000000..bb8d40e788
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
@@ -0,0 +1,127 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.itest.servicereference.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ServiceReference;
+
+/**
+ * Utility methods that are used by the ServiceReference Serialization tests
+ * 
+ * @version $Date $Revision$
+ */
+public final class ServiceReferenceUtils {
+
+    /**
+     * Constructor
+     */
+    private ServiceReferenceUtils() {
+    }
+
+    /**
+     * Serializes the specified Object to a byte[]
+     * 
+     * @param obj The Object to Serialize
+     * @return The Serialized Object as a byte[]
+     * @throws IOException Failed to Serialize the Object
+     */
+    public static byte[] serialize(Object obj) throws IOException {
+        ByteArrayOutputStream bos = null;
+        try {
+            ObjectOutputStream oos = null;
+            bos = new ByteArrayOutputStream();
+            try {
+                oos = new ObjectOutputStream(bos);
+                oos.writeObject(obj);
+                oos.flush();
+            } finally {
+                if (oos != null) {
+                    oos.close();
+                }
+            }
+        } finally {
+            if (bos != null) {
+                bos.close();
+            }
+        }
+
+        return bos.toByteArray();
+    }
+
+    /**
+     * Deserializes the specified byte[] into a ServiceReference
+     * 
+     * @param serializedSR The Serialized ServiceReference to deserialize
+     * @return The deserialized ServiceReference
+     * @throws IOException Failed to deserialize the ServiceReference
+     * @throws ClassNotFoundException Failed to deserialize the ServiceReference
+     */
+    public static ServiceReference<?> deserializeServiceReference(byte[] serializedSR)
+            throws IOException, ClassNotFoundException {
+        return (ServiceReference<?>) deserialize(serializedSR);
+    }
+
+    /**
+     * Deserializes the specified byte[] into a CallableReference
+     * 
+     * @param callableRef The Serialized CallableReference to deserialize
+     * @return The deserialized ServiceReference
+     * @throws IOException Failed to deserialize the CallableReference
+     * @throws ClassNotFoundException Failed to deserialize the CallableReference
+     */
+    public static CallableReference<?> deserializeCallableReference(byte[] callableRef)
+            throws IOException, ClassNotFoundException {
+        return (CallableReference<?>) deserialize(callableRef);
+    }
+
+    /**
+     * Deserializes the specified byte[] into an Object
+     * 
+     * @param serializedObj The Serialized Object to deserialize
+     * @return The deserialized Object
+     * @throws IOException Failed to deserialize the Object
+     * @throws ClassNotFoundException Failed to deserialize the Object
+     */
+    public static Object deserialize(byte[] serializedSR) throws IOException, ClassNotFoundException {
+        ByteArrayInputStream bis = null;
+        try {
+            ObjectInputStream ois = null;
+            bis = new ByteArrayInputStream(serializedSR);
+            try {
+                ois = new ObjectInputStream(bis);
+                Object obj = ois.readObject();
+                return obj;
+            } finally {
+                if (ois != null) {
+                    ois.close();
+                }
+            }
+        } finally {
+            if (bis != null) {
+                bis.close();
+            }
+        }
+    }
+}
diff --git a/sca-java-2.x/contrib/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite b/sca-java-2.x/contrib/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
new file mode 100644
index 0000000000..28c32d6fa4
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.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
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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:foo="http://foo" targetNamespace="http://foo"
+    name="ServiceReferenceSerializationTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <component name="StatelessComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.StatelessServiceImpl" />
+    </component>
+
+    <component name="ConversationalComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.ConversationalServiceImpl" />
+    </component>
+
+    <component name="SCAManagedClientComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.SCAManagedClientImpl" />
+        <reference name="statelessService" target="StatelessComponent"/>
+        <reference name="nestedStatelessService" target="NestedComponent/StatelessNestedService"/>
+    </component>
+
+    <component name="SCAManagedConversationalClientComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.SCAManagedConversationalClientImpl" />
+        <reference name="conversationalService" target="ConversationalComponent"/>
+        <reference name="nestedConversationalService" target="NestedComponent/ConversationalNestedService"/>
+    </component>
+
+    <component name="NestedComponent">
+        <implementation.composite name="foo:NestedComposite" />
+    </component>
+</composite>
diff --git a/sca-java-2.x/contrib/itest/serialization/src/main/resources/nestedcomposite.composite b/sca-java-2.x/contrib/itest/serialization/src/main/resources/nestedcomposite.composite
new file mode 100644
index 0000000000..8e1a132b0a
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/serialization/src/main/resources/nestedcomposite.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
+    * with the License.  You may obtain a copy of the License at
+    *
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT 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:foo="http://foo" targetNamespace="http://foo"
+    name="NestedComposite" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <service name="StatelessNestedService" promote = "StatelessNestedComponent"/>
+    
+    <service name="ConversationalNestedService" promote = "ConversationalNestedComponent"/>
+
+    <component name="StatelessNestedComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.StatelessServiceImpl" />
+    </component>
+
+    <component name="ConversationalNestedComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.ConversationalServiceImpl" />
+    </component>
+</composite>
diff --git a/sca-java-2.x/contrib/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java b/sca-java-2.x/contrib/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
new file mode 100644
index 0000000000..76e77284fb
--- /dev/null
+++ b/sca-java-2.x/contrib/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.itest.servicereference;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * A test case that will attempt to Serialize and Deserialize Service References
+ * 
+ * @version $Date$ $Revision$
+ */
+public class SerializeServiceReferenceTestCase {
+    /**
+     * Reference to the SCA Domain
+     */
+    private static SCADomain domain;
+
+    /**
+     * Initialise the SCA Domain
+     * 
+     * @throws Exception Failed to initialise the SCA Domain
+     */
+    @BeforeClass
+    public static void init() throws Exception {
+        domain = SCADomain.newInstance("ServiceReferenceSerializationTest.composite");
+        Assert.assertNotNull(domain);
+    }
+
+    /**
+     * Shutdown the SCA Domain
+     * 
+     * @throws Exception Failed to shutdown the SCA Domain
+     */
+    @AfterClass
+    public static void destroy() throws Exception {
+        if (domain != null) {
+            domain.close();
+        }
+    }
+
+    /**
+     * Tests Serializing a Stateless ServiceReference as managed
+     * SCA code
+     * 
+     * @throws Exception Test failed
+     */
+    @Test
+    public void testSerializeStatelessServiceReferenceInsideSCA() throws Exception {
+        SCAManagedClient client = domain.getService(
+                SCAManagedClient.class, "SCAManagedClientComponent");
+
+        client.testSerializeStatelessServiceReference();
+    }
+
+    /**
+     * Tests Serializing a Nested Stateless ServiceReference as managed
+     * SCA code.
+     * 
+     * @throws Exception Test failed
+     */
+    @Test
+    public void testSerializeNestedStatelessServiceReferenceInsideSCA() throws Exception {
+        SCAManagedClient client = domain.getService(
+                SCAManagedClient.class, "SCAManagedClientComponent");
+
+        client.testSerializeNestedStatelessServiceReference();
+    }
+
+    /**
+     * Tests Serializing a Conversational ServiceReference as managed
+     * SCA code
+     * 
+     * @throws Exception Test failed
+     */
+    @Test
+    public void testSerializeConversationalServiceReferenceInsideSCA() throws Exception {
+        SCAManagedConversationalClient client = domain.getService(
+                SCAManagedConversationalClient.class, "SCAManagedConversationalClientComponent");
+
+        client.testSerializeConversationalServiceReference();
+    }
+
+    /**
+     * Tests Serializing a Nested Conversational ServiceReference as managed
+     * SCA code.
+     * 
+     * @throws Exception Test failed
+     */
+    @Test
+    public void testSerializeNestedConversationalServiceReferenceInsideSCA() throws Exception {
+        SCAManagedConversationalClient client = domain.getService(
+                SCAManagedConversationalClient.class, "SCAManagedConversationalClientComponent");
+
+        client.testSerializeNestedConversationalServiceReference();
+    }
+
+    /**
+     * Tests Serializing a Callback to a Stateless Service as managed
+     * SCA code
+     * 
+     * @throws Exception Test failed
+     */
+    @Test
+    public void testSerializeCallbackToStatelessServiceInsideSCA() throws Exception {
+        SCAManagedClient client = domain.getService(
+                SCAManagedClient.class, "SCAManagedClientComponent");
+
+        client.testSerializeCallbackToStatelessServiceInsideSCA();
+    }
+
+    /**
+     * Tests Serializing a Callback to a Conversational Service as managed
+     * SCA code.
+     * 
+     * @throws Exception Test failed
+     */
+    @Test
+    public void testSerializeCallbackToConversationalServiceInsideSCA() throws Exception {
+        SCAManagedConversationalClient client = domain.getService(
+                SCAManagedConversationalClient.class, "SCAManagedConversationalClientComponent");
+
+        client.testSerializeCallbackToConversationalServiceInsideSCA();
+    }
+}