25 files changed, 2778 insertions, 0 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
new file mode 100644
index 0000000000..9cd88620e3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.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.itest.conversational;
+
+public class BusinessException extends Exception {
+
+    private String message;
+
+    public BusinessException() {
+        super();
+    }
+
+    public BusinessException(String message) {
+        super(message);
+        setMessage(message);
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
new file mode 100644
index 0000000000..53dadc3dc7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.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.itest.conversational;
+
+import org.osoa.sca.annotations.Conversational;
+
+@Conversational
+public interface ConversationIdService {
+
+    String getCIDField();
+    String getCIDSetter();
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
new file mode 100644
index 0000000000..cb7a032e85
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.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.itest.conversational;
+
+import org.osoa.sca.annotations.Conversational;
+import org.osoa.sca.annotations.EndsConversation;
+import org.osoa.sca.annotations.Remotable;
+
+
+/**
+ * The callback interface used when testing conversational callbacks
+ *
+ * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
+ */
+@Remotable
+@Conversational
+public interface ConversationalCallback {
+	
+   // public void init();
+    
+   // public void destroy();
+    
+    public void initializeCount(int count);
+    
+    public void incrementCount();
+    
+    public int retrieveCount();
+    
+    public void businessException() throws BusinessException;        
+    
+    @EndsConversation
+    public String endConversation();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
new file mode 100644
index 0000000000..2532346349
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.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.itest.conversational;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * The client for the conversational itest. Is implemented by clients
+ * offering both stateless and stateful callbacks
+ *
+ * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
+ */
+
+@Remotable
+public interface ConversationalClient { 
+	
+	public int runConversationFromInjectedReference();
+	public int runConversationFromInjectedReference2();
+	public int runConversationFromServiceReference();
+	public int runConversationWithUserDefinedConversationId();
+	public String runConversationCheckUserDefinedConversationId();	
+	public int runConversationCheckingScope();
+	public int runConversationWithCallback(); 
+	public int runConversationHavingPassedReference();
+	public String runConversationBusinessException();
+	public String runConversationBusinessExceptionCallback();
+	public int runConversationCallingEndedConversation();
+	public int runConversationCallingEndedConversationCallback();
+        public String runConversationCallingEndedConversationCheckConversationId(); 
+	public String runConversationCallingEndedConversationCallbackCheckConversationId();
+	public int runConversationAgeTimeout();
+	public int runConversationIdleTimeout();
+	public int runConversationPrincipleError();	
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
new file mode 100644
index 0000000000..8f008fa711
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.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.itest.conversational;
+
+import org.osoa.sca.CallableReference;
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * The client that calls into an existing conversation by accepting
+ * a reference to that conversation
+ *
+ * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
+ */
+
+@Remotable
+public interface ConversationalReferenceClient { 
+	
+    public void incrementCount(CallableReference<ConversationalService> conversationalService);
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
new file mode 100644
index 0000000000..1e36ce6917
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.conversational;
+
+import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.Conversational;
+import org.osoa.sca.annotations.EndsConversation;
+import org.osoa.sca.annotations.Remotable;
+
+
+/**
+ * The service interface used when testing conversations
+ *
+ * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
+ */
+@Remotable
+@Conversational
+@Callback(ConversationalCallback.class)
+public interface ConversationalService {
+    
+    public void initializeCount(int count);
+    
+    public void incrementCount();
+    
+    public int retrieveCount();
+    
+    //public void businessException() throws BusinessException;        
+    
+    public void initializeCountCallback(int count);
+    
+    public void incrementCountCallback();
+    
+    public int retrieveCountCallback();
+    
+    //public void businessExceptionCallback() throws BusinessException;    
+    
+    @EndsConversation
+    public String endConversation();
+    
+    public String endConversationCallback();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
new file mode 100644
index 0000000000..b4d3fe3d71
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.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.itest.conversational;
+
+import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.Conversational;
+import org.osoa.sca.annotations.EndsConversation;
+import org.osoa.sca.annotations.Remotable;
+
+
+/**
+ * The service interface used when testing conversations
+ *
+ * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
+ */
+@Remotable
+@Conversational
+@Callback(NonConversationalCallback.class)
+public interface ConversationalServiceNonConversationalCallback {
+
+    
+    public void initializeCount(int count);
+    
+    public void incrementCount();
+    
+    public int retrieveCount();
+    
+    public void businessException() throws BusinessException;        
+    
+    public void initializeCountCallback(int count);
+    
+    public void incrementCountCallback();
+    
+    public int retrieveCountCallback();
+    
+    public void businessExceptionCallback() throws BusinessException;    
+    
+    @EndsConversation
+    public String endConversation();
+    
+    public String endConversationCallback();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
new file mode 100644
index 0000000000..ed3a01c10b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.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.itest.conversational;
+
+import org.osoa.sca.annotations.Remotable;
+
+
+/**
+ * The callback interface used when testing conversational callbacks
+ *
+ * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
+ */
+@Remotable
+public interface NonConversationalCallback {
+	   
+    public void initializeCount(int count);
+    
+    public void incrementCount();
+    
+    public int retrieveCount();
+    
+    public void businessException() throws BusinessException;        
+    
+    public String endConversation();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
new file mode 100644
index 0000000000..1603916cca
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.conversational.impl;
+
+import org.apache.tuscany.sca.itest.conversational.BusinessException;
+import org.apache.tuscany.sca.itest.conversational.ConversationalService;
+import org.osoa.sca.annotations.ConversationAttributes;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(ConversationalService.class)
+@Scope("CONVERSATION")
+@ConversationAttributes(maxAge="1 seconds")
+public class ConversationAgeComponentImpl implements ConversationalService {
+
+    private int count;
+    
+    public void businessException() throws BusinessException {   
+    }
+    
+    public void businessExceptionCallback() throws BusinessException {   
+    }      
+
+    public void destroy() {
+    }
+
+    public String endConversation() {
+        return null;
+    }
+
+    public String endConversationCallback() {
+        return null;
+    }
+
+    public void incrementCount() {
+    }
+
+    public void incrementCountCallback() {
+    }
+
+    public void init() {
+    }
+
+    public void initializeCount(int count) {
+        this.count = count;
+    }
+
+    public void initializeCountCallback(int count) {
+    }
+
+    public int retrieveCount() {
+        return count;
+    }
+
+    public int retrieveCountCallback() {
+        return 0;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
new file mode 100644
index 0000000000..accc1eee27
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.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.itest.conversational.impl;
+
+import org.apache.tuscany.sca.itest.conversational.ConversationIdService;
+import org.osoa.sca.annotations.ConversationID;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(ConversationIdService.class)
+@Scope("CONVERSATION")
+public class ConversationIdComponentImpl implements ConversationIdService {
+
+    @ConversationID
+    public String cid;
+
+    private String setterCid;
+    
+    public String getCIDField() {
+        return cid;
+    }
+    public String getCIDSetter() {
+        return setterCid;
+    }
+    
+
+    @ConversationID
+    public void setCID(String cid) {
+        this.setterCid = cid;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
new file mode 100644
index 0000000000..90f6de86ac
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.conversational.impl;
+
+import org.apache.tuscany.sca.itest.conversational.BusinessException;
+import org.apache.tuscany.sca.itest.conversational.ConversationalService;
+import org.osoa.sca.annotations.ConversationAttributes;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(ConversationalService.class)
+@Scope("CONVERSATION")
+@ConversationAttributes(maxIdleTime="1 seconds")
+public class ConversationMaxIdleComponentImpl implements ConversationalService {
+
+    private int count;
+
+    public void businessException() throws BusinessException {   
+    }
+    
+    public void businessExceptionCallback() throws BusinessException {   
+    }    
+    
+    public void destroy() {
+    }
+
+    public String endConversation() {
+        return null;
+    }
+
+    public String endConversationCallback() {
+        return null;
+    }
+
+    public void incrementCount() {
+    }
+
+    public void incrementCountCallback() {
+    }
+
+    public void init() {
+    }
+
+    public void initializeCount(int count) {
+        this.count = count;
+    }
+
+    public void initializeCountCallback(int count) {
+    }
+
+    public int retrieveCount() {
+        return count;
+    }
+
+    public int retrieveCountCallback() {
+        return 0;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
new file mode 100644
index 0000000000..3f7a90b3dc
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
@@ -0,0 +1,322 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.conversational.impl;
+
+import org.apache.tuscany.sca.itest.conversational.BusinessException;
+import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
+import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
+import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
+import org.apache.tuscany.sca.itest.conversational.ConversationalService;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.ConversationAttributes;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * The client for the conversational itest which presents a stateful
+ * callback interface
+ *
+ * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
+ */
+
+@Service(interfaces={ConversationalClient.class})
+@Scope("CONVERSATION")
+@ConversationAttributes(maxAge="10 minutes",
+                        maxIdleTime="5 minutes",
+                        singlePrincipal=false)
+public class ConversationalClientStatefulImpl implements ConversationalClient, ConversationalCallback {
+    
+    @Context
+    protected ComponentContext componentContext;
+    
+    @Reference 
+    protected ConversationalService conversationalService;
+    
+    @Reference 
+    protected ConversationalService conversationalService2;
+    
+    @Reference
+    protected ConversationalReferenceClient conversationalReferenceClient;
+      
+    private int clientCount = 0;
+    private int callbackCount = 0;  
+    
+    
+    // a static member variable that records the number of times this service is called
+    public static StringBuffer calls = new StringBuffer();        
+	
+    // From ConversationalClient
+	public int runConversationFromInjectedReference(){
+	    calls.append("runConversationFromInjectedReference,");	    
+	    conversationalService.initializeCount(1);
+	    conversationalService.incrementCount();
+	    clientCount = conversationalService.retrieveCount();
+	    conversationalService.endConversation();
+	    
+	    return clientCount;
+	}
+    public int runConversationFromInjectedReference2(){
+        calls.append("runConversationFromInjectedReference2,");
+               
+        conversationalService2.initializeCount(1);
+        conversationalService2.incrementCount();
+        
+        // stick in a call to the first reference to 
+        // make sure the two references don't clash
+        conversationalService.initializeCount(1);
+        
+        clientCount = conversationalService2.retrieveCount();
+        conversationalService2.endConversation();
+        
+        // end the conversation through the first reference
+        conversationalService.endConversation();
+        
+        return clientCount;
+    }	
+    public int runConversationFromServiceReference(){
+        calls.append("runConversationFromServiceReference,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        clientCount = callableReference.retrieveCount();
+        callableReference.endConversation();
+        
+        // serviceReference.getConversation().end();
+        
+        return clientCount;
+    }	
+    public int runConversationWithUserDefinedConversationId(){
+        calls.append("runConversationWithUserDefinedConversationId,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");
+        serviceReference.setConversationID("MyConversation1");
+        
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        clientCount = callableReference.retrieveCount();
+        callableReference.endConversation();
+        
+        // serviceReference.getConversation().end();
+        
+        return clientCount;
+    }    
+    public String runConversationCheckUserDefinedConversationId(){
+        calls.append("runConversationCheckUserDefinedConversationId,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");
+        serviceReference.setConversationID("MyConversation2");
+        
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        clientCount = callableReference.retrieveCount();
+        
+        String clientConversationId = serviceReference.getConversationID().toString();
+        String serverConversationId = callableReference.endConversation();
+        
+        if (clientConversationId.equals("MyConversation2") &&
+            serverConversationId.equals("MyConversation2") ) {
+            return clientConversationId;
+        } else {
+            return "client = " + clientConversationId +
+                   "server = " + serverConversationId;
+        }  
+              
+    }      
+    public int runConversationCheckingScope(){
+        calls.append("runConversationCheckingScope,");
+        // run a conversation
+        return runConversationFromInjectedReference();
+        
+        // test will then use a static method to find out how many times 
+        // init/destroy were called
+    }    
+	public int runConversationWithCallback(){
+	    calls.append("runConversationWithCallback,");
+	    callbackCount = 2;
+        conversationalService.initializeCountCallback(1);
+        conversationalService.incrementCountCallback();
+        clientCount = conversationalService.retrieveCountCallback();
+        conversationalService.endConversationCallback();
+        
+        return clientCount;
+    } 
+    public int runConversationHavingPassedReference(){
+        calls.append("runConversationHavingPassedReference,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");       
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        conversationalReferenceClient.incrementCount(serviceReference);
+        clientCount = callableReference.retrieveCount();
+        callableReference.endConversation();
+        
+        serviceReference.getConversation().end();
+        
+        return clientCount;
+    }
+    public String runConversationBusinessException(){
+        calls.append("runConversationbusinessException,");      
+        try {
+            conversationalService.initializeCount(1);
+//            conversationalService.businessException();
+            clientCount = conversationalService.retrieveCount();
+            conversationalService.endConversation();
+        } catch(Exception ex) {
+            return ex.getMessage();
+        }
+         
+        return "No Exception Returned";
+    }
+    
+    public String runConversationBusinessExceptionCallback(){
+        calls.append("runConversationbusinessExceptionCallback,");
+        try {
+            conversationalService.initializeCountCallback(1);
+//            conversationalService.businessExceptionCallback();
+            clientCount = conversationalService.retrieveCountCallback();
+            conversationalService.endConversationCallback();
+        } catch(Exception ex) {
+            return ex.getMessage();
+        }
+         
+        return "No Exception Returned";
+    }   
+    
+    public int runConversationCallingEndedConversation(){
+        calls.append("runConversationCallingEndedConversation,");
+        conversationalService.initializeCount(1);
+        conversationalService.endConversation();
+        return conversationalService.retrieveCount();
+    }       
+    
+    public int runConversationCallingEndedConversationCallback(){
+        calls.append("runConversationCallingEndedConversationCallback,");
+        conversationalService.initializeCountCallback(1);
+        conversationalService.endConversationCallback();
+        return conversationalService.retrieveCountCallback();
+    } 
+     
+    public String runConversationCallingEndedConversationCheckConversationId(){
+        calls.append("runConversationCallingEndedConversationCheckConversationId,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");
+        serviceReference.setConversationID("MyConversation3");
+        
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        clientCount = callableReference.retrieveCount();
+        callableReference.endConversation();
+        
+        if (serviceReference.getConversation() ==null ) {
+            return null;
+        } else {
+            return serviceReference.getConversation().getConversationID().toString();
+        }
+    }    
+    
+    public String runConversationCallingEndedConversationCallbackCheckConversationId(){
+        calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");
+        serviceReference.setConversationID("MyConversation3");
+        
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        clientCount = callableReference.retrieveCount();
+        callableReference.endConversationCallback();
+        
+        if (serviceReference.getConversation() ==null ) {
+            return null;
+        } else {
+            return serviceReference.getConversation().getConversationID().toString();
+        }
+    }    
+    
+    public int runConversationAgeTimeout(){
+        calls.append("runConversationAgeTimeout,");
+        // done in other testing
+        return clientCount;
+    }
+    public int runConversationIdleTimeout(){
+        calls.append("runConversationIdleTimeout,");
+        // done in other testing
+        return clientCount;
+    }
+    public int runConversationPrincipleError(){
+        calls.append("runConversationPrincipleError,");
+        // TODO - when policy framework is done
+        return clientCount;
+    }
+    
+    
+    // From ConversationalCallback
+    @Init
+    public void init(){
+        calls.append("init,");
+    }
+    
+    @Destroy
+    public void destroy(){
+        calls.append("destroy,"); 
+    }
+    
+    public void initializeCount(int count){
+        calls.append("initializeCount,");
+        callbackCount += count;
+    }
+    
+    public void incrementCount(){
+        calls.append("incrementCount,");
+        callbackCount++;
+    }
+    
+    public int retrieveCount(){
+        calls.append("retrieveCount,");
+        return  callbackCount;
+    }
+    
+    public void businessException() throws BusinessException {
+        throw new BusinessException("Business Exception");
+    }     
+    
+    public String endConversation(){
+        calls.append("endConversation,");
+        callbackCount = 0;
+        return null;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
new file mode 100644
index 0000000000..ab91498132
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
@@ -0,0 +1,311 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.conversational.impl;
+
+import org.apache.tuscany.sca.itest.conversational.BusinessException;
+import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
+import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
+import org.apache.tuscany.sca.itest.conversational.ConversationalService;
+import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.ConversationAttributes;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * The client for the conversational itest which presents a stateful
+ * callback interface
+ *
+ * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
+ */
+
+@Service(interfaces={ConversationalClient.class})
+@Scope("CONVERSATION")
+@ConversationAttributes(maxAge="10 minutes",
+                        maxIdleTime="5 minutes",
+                        singlePrincipal=false)
+public class ConversationalClientStatefulNonConversationalCallbackImpl implements ConversationalClient, NonConversationalCallback {
+    
+    @Context
+    protected ComponentContext componentContext;
+    
+    @Reference 
+    protected ConversationalService conversationalService;
+    
+    @Reference 
+    protected ConversationalService conversationalService2;
+    
+    @Reference
+    protected ConversationalReferenceClient conversationalReferenceClient;
+      
+    private int clientCount = 0;
+    private int callbackCount = 0;  
+    
+    
+    // a static member variable that records the number of times this service is called
+    public static StringBuffer calls = new StringBuffer();        
+	
+    // From ConversationalClient
+	public int runConversationFromInjectedReference(){
+	    calls.append("runConversationFromInjectedReference,");	    
+	    conversationalService.initializeCount(1);
+	    conversationalService.incrementCount();
+	    clientCount = conversationalService.retrieveCount();
+	    conversationalService.endConversation();
+	    
+	    return clientCount;
+	}
+    public int runConversationFromInjectedReference2(){
+        calls.append("runConversationFromInjectedReference2,");
+               
+        conversationalService2.initializeCount(1);
+        conversationalService2.incrementCount();
+        
+        // stick in a call to the first reference to 
+        // make sure the two references don't clash
+        conversationalService.initializeCount(1);
+        
+        clientCount = conversationalService2.retrieveCount();
+        conversationalService2.endConversation();
+        
+        // end the conversation through the first reference
+        conversationalService.endConversation();
+        
+        return clientCount;
+    }	
+    public int runConversationFromServiceReference(){
+        calls.append("runConversationFromServiceReference,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        clientCount = callableReference.retrieveCount();
+        callableReference.endConversation();
+        
+        // serviceReference.getConversation().end();
+        
+        return clientCount;
+    }	
+    public int runConversationWithUserDefinedConversationId(){
+        calls.append("runConversationWithUserDefinedConversationId,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");
+        serviceReference.setConversationID("MyConversation1");
+        
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        clientCount = callableReference.retrieveCount();
+        callableReference.endConversation();
+        
+        // serviceReference.getConversation().end();
+        
+        return clientCount;
+    }    
+    public String runConversationCheckUserDefinedConversationId(){
+        calls.append("runConversationCheckUserDefinedConversationId,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");
+        serviceReference.setConversationID("MyConversation2");
+        
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        clientCount = callableReference.retrieveCount();
+        return callableReference.endConversation();
+              
+    }      
+    public int runConversationCheckingScope(){
+        calls.append("runConversationCheckingScope,");
+        // run a conversation
+        return runConversationFromInjectedReference();
+        
+        // test will then use a static method to find out how many times 
+        // init/destroy were called
+    }    
+	public int runConversationWithCallback(){
+	    calls.append("runConversationWithCallback,");
+	    callbackCount = 2;
+        conversationalService.initializeCountCallback(1);
+        conversationalService.incrementCountCallback();
+        clientCount = conversationalService.retrieveCountCallback();
+        conversationalService.endConversationCallback();
+        
+        return clientCount;
+    } 
+    public int runConversationHavingPassedReference(){
+        calls.append("runConversationHavingPassedReference,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");       
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        conversationalReferenceClient.incrementCount(serviceReference);
+        clientCount = callableReference.retrieveCount();
+        callableReference.endConversation();
+        
+        // serviceReference.getConversation().end();
+        
+        return clientCount;
+    }
+    public String runConversationBusinessException(){
+        calls.append("runConversationbusinessException,");      
+        try {
+            conversationalService.initializeCount(1);
+//            conversationalService.businessException();
+            clientCount = conversationalService.retrieveCount();
+            conversationalService.endConversation();
+        } catch(Exception ex) {
+            return ex.getMessage();
+        }
+         
+        return "No Exception Returned";
+    }
+    
+    public String runConversationBusinessExceptionCallback(){
+        calls.append("runConversationbusinessExceptionCallback,");
+        try {
+            conversationalService.initializeCountCallback(1);
+//            conversationalService.businessExceptionCallback();
+            clientCount = conversationalService.retrieveCountCallback();
+            conversationalService.endConversationCallback();
+        } catch(Exception ex) {
+            return ex.getMessage();
+        }
+         
+        return "No Exception Returned";
+    }   
+    
+    public String runConversationCallingEndedConversationCheckConversationId(){
+        calls.append("runConversationCallingEndedConversationCheckConversationId,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");
+        serviceReference.setConversationID("MyConversation3");
+        
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        clientCount = callableReference.retrieveCount();
+        callableReference.endConversation();
+        
+        if (serviceReference.getConversation() ==null ) {
+            return null;
+        } else {
+            return serviceReference.getConversation().getConversationID().toString();
+        }
+    }    
+    
+    public String runConversationCallingEndedConversationCallbackCheckConversationId(){
+        calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");
+        serviceReference.setConversationID("MyConversation3");
+        
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        clientCount = callableReference.retrieveCount();
+        callableReference.endConversationCallback();
+        
+        if (serviceReference.getConversation() ==null ) {
+            return null;
+        } else {
+            return serviceReference.getConversation().getConversationID().toString();
+        }
+    }     
+    
+    public int runConversationCallingEndedConversation(){
+        calls.append("runConversationCallingEndedConversation,");
+        conversationalService.initializeCount(1);
+        conversationalService.endConversation();
+        return conversationalService.retrieveCount();
+    }   
+    
+    public int runConversationCallingEndedConversationCallback(){
+        calls.append("runConversationCallingEndedConversationCallback,");
+        conversationalService.initializeCountCallback(1);
+        conversationalService.endConversationCallback();
+        return conversationalService.retrieveCountCallback();
+    }  
+    
+    public int runConversationAgeTimeout(){
+        calls.append("runConversationAgeTimeout,");
+        // done in other testing
+        return clientCount;
+    }
+    public int runConversationIdleTimeout(){
+        calls.append("runConversationIdleTimeout,");
+        // done in other testing
+        return clientCount;
+    }
+    public int runConversationPrincipleError(){
+        calls.append("runConversationPrincipleError,");
+        // TODO - when policy framework is done
+        return clientCount;
+    }
+    
+    
+    // From ConversationalCallback
+    @Init
+    public void init(){
+        calls.append("init,");
+    }
+    
+    @Destroy
+    public void destroy(){
+        calls.append("destroy,"); 
+    }
+    
+    public void initializeCount(int count){
+        calls.append("initializeCount,");
+        callbackCount += count;
+    }
+    
+    public void incrementCount(){
+        calls.append("incrementCount,");
+        callbackCount++;
+    }
+    
+    public int retrieveCount(){
+        calls.append("retrieveCount,");
+        return  callbackCount;
+    }
+    
+    public void businessException() throws BusinessException {
+        throw new BusinessException("Business Exception");
+    }     
+    
+    public String endConversation(){
+        calls.append("endConversation,");
+        return null;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
new file mode 100644
index 0000000000..e4f83656de
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
@@ -0,0 +1,318 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.conversational.impl;
+
+import org.apache.tuscany.sca.itest.conversational.BusinessException;
+import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
+import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
+import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
+import org.apache.tuscany.sca.itest.conversational.ConversationalService;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * The client for the conversational itest which presents a stateful
+ * callback interface
+ *
+ * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
+ */
+
+@Service(interfaces={ConversationalClient.class})
+public class ConversationalClientStatelessImpl implements ConversationalClient, ConversationalCallback {
+   
+    @Context
+    protected ComponentContext componentContext;
+    
+    @Reference 
+    protected ConversationalService conversationalService;
+    
+    @Reference 
+    protected ConversationalService conversationalService2;
+    
+    @Reference
+    protected ConversationalReferenceClient conversationalReferenceClient;
+    
+    private int clientCount = 0;
+    private int callbackCount = 0;
+    
+    // a static member variable that records the number of times this service is called
+    public static StringBuffer calls = new StringBuffer();    
+	
+    // From ConversationalClient
+    public int runConversationFromInjectedReference(){
+        calls.append("runConversationFromInjectedReference,");
+        conversationalService.initializeCount(1);
+        conversationalService.incrementCount();
+        clientCount = conversationalService.retrieveCount();
+        conversationalService.endConversation();
+        
+        return clientCount;
+    }
+    public int runConversationFromInjectedReference2(){
+        calls.append("runConversationFromInjectedReference2,");   
+
+        // now test the second reference        
+        conversationalService2.initializeCount(1);
+        conversationalService2.incrementCount();
+        
+        // stick in a call to the first reference to 
+        // make sure the two references don't clash
+        conversationalService.initializeCount(1);
+        
+        clientCount = conversationalService2.retrieveCount();
+        conversationalService2.endConversation();
+        
+        // end the conversation through the first reference
+        conversationalService.endConversation();
+        
+        return clientCount;
+    }
+    public int runConversationFromServiceReference(){
+        calls.append("runConversationFromServiceReference,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");       
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        clientCount = callableReference.retrieveCount();
+        callableReference.endConversation();
+        
+        // serviceReference.getConversation().end();
+        
+        return clientCount;
+    }   
+    public int runConversationWithUserDefinedConversationId(){
+        calls.append("runConversationWithUserDefinedConversationId,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");
+        serviceReference.setConversationID("MyConversation1");
+        
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        clientCount = callableReference.retrieveCount();
+        callableReference.endConversation();
+        
+        // serviceReference.getConversation().end();
+        
+        return clientCount;
+    }    
+    public String runConversationCheckUserDefinedConversationId(){
+        calls.append("runConversationCheckUserDefinedConversationId,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");
+        serviceReference.setConversationID("MyConversation2");
+        
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        clientCount = callableReference.retrieveCount();
+        
+        String clientConversationId = serviceReference.getConversationID().toString();
+        String serverConfersationId = callableReference.endConversation();
+        
+        if (clientConversationId.equals("MyConversation2") &&
+            serverConfersationId.equals("MyConversation2") ) {
+            return clientConversationId;
+        } else {
+            return "client = " + clientConversationId +
+                   "server = " + serverConfersationId;
+        }     
+    }     
+    public int runConversationCheckingScope(){
+        calls.append("runConversationCheckingScope,");
+        // run a conversation
+        return runConversationFromInjectedReference();
+        
+        // test will then use a static method to find out how many times 
+        // init/destroy were called
+    }
+    public int runConversationWithCallback(){
+        calls.append("runConversationWithCallback,");
+        conversationalService.initializeCountCallback(1);
+        conversationalService.incrementCountCallback();
+        clientCount = conversationalService.retrieveCountCallback();
+        conversationalService.endConversationCallback();
+        
+        return clientCount;
+    } 
+    
+    public int runConversationHavingPassedReference(){
+        calls.append("runConversationHavingPassedReference,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");       
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        conversationalReferenceClient.incrementCount(serviceReference);
+        clientCount = callableReference.retrieveCount();
+        callableReference.endConversation();
+        
+        serviceReference.getConversation().end();
+        
+        return clientCount;
+    }	
+    
+    public String runConversationBusinessException(){
+	    calls.append("runConversationbusinessException,");	    
+	    try {
+            conversationalService.initializeCount(1);
+//            conversationalService.businessException();
+            clientCount = conversationalService.retrieveCount();
+            conversationalService.endConversation();
+	    } catch(Exception ex) {
+	        return ex.getMessage();
+	    }
+         
+        return "No Exception Returned";
+    }
+	
+    public String runConversationBusinessExceptionCallback(){
+        calls.append("runConversationbusinessExceptionCallback,");
+        try {
+            conversationalService.initializeCountCallback(1);
+//            conversationalService.businessExceptionCallback();
+            clientCount = conversationalService.retrieveCountCallback();
+            conversationalService.endConversationCallback();
+        } catch(Exception ex) {
+            return ex.getMessage();
+        }
+         
+        return "No Exception Returned";
+    }	
+	
+    public int runConversationCallingEndedConversation(){
+        calls.append("runConversationCallingEndedConversation,");
+        conversationalService.initializeCount(1);
+        conversationalService.endConversation();
+        return conversationalService.retrieveCount();
+    }   
+    
+    public int runConversationCallingEndedConversationCallback(){
+        calls.append("runConversationCallingEndedConversationCallback,");
+        conversationalService.initializeCountCallback(1);
+        conversationalService.endConversationCallback();
+        return conversationalService.retrieveCountCallback();
+    }   
+    
+    public String runConversationCallingEndedConversationCheckConversationId(){
+        calls.append("runConversationCallingEndedConversationCheckConversationId,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");
+        serviceReference.setConversationID("MyConversation3");
+        
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        clientCount = callableReference.retrieveCount();
+        callableReference.endConversation();
+        
+        if (serviceReference.getConversation() ==null ) {
+            return null;
+        } else {
+            return serviceReference.getConversation().getConversationID().toString();
+        }
+    }    
+    
+    public String runConversationCallingEndedConversationCallbackCheckConversationId(){
+        calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");
+        ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class, 
+                                                                                                        "conversationalService");
+        serviceReference.setConversationID("MyConversation3");
+        
+        ConversationalService callableReference = serviceReference.getService();
+        
+        callableReference.initializeCount(1);
+        callableReference.incrementCount();
+        clientCount = callableReference.retrieveCount();
+        callableReference.endConversationCallback();
+        
+        if (serviceReference.getConversation() ==null ) {
+            return null;
+        } else {
+            return serviceReference.getConversation().getConversationID().toString();
+        } 
+    }    
+    
+    public int runConversationAgeTimeout(){
+        calls.append("runConversationAgeTimeout,");
+        // done in other testing
+        return clientCount;
+    }
+    public int runConversationIdleTimeout(){
+        calls.append("runConversationIdleTimeout,");
+        // done in other testing
+        return clientCount;
+    }
+    public int runConversationPrincipleError(){
+        calls.append("runConversationPrincipleError,");
+        // TODO - when policy framework is done
+        return clientCount;
+    }
+    
+    
+    // From ConversationalCallback
+    @Init
+    public void init(){
+        calls.append("init,");
+
+    }
+    
+    @Destroy
+    public void destroy(){
+        calls.append("destroy,");
+        
+    }
+    
+    public void initializeCount(int count){
+        calls.append("initializeCount,");
+        callbackCount = 0;
+    }
+    
+    public void incrementCount(){
+        calls.append("incrementCount,");
+        callbackCount++;
+    }
+    
+    public int retrieveCount(){
+        calls.append("retrieveCount,");
+        return  callbackCount;
+    }
+    
+    public void businessException() throws BusinessException {
+        throw new BusinessException("Business Exception");
+    }     
+    
+    public String endConversation(){
+        calls.append("endConversation,");
+        callbackCount = 0;
+        return null;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
new file mode 100644
index 0000000000..8fe7c5b6ba
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.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.itest.conversational.impl;
+
+import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
+import org.apache.tuscany.sca.itest.conversational.ConversationalService;
+import org.osoa.sca.CallableReference;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * A client component that accepts a reference to an ongoing conversation
+ * and takes part in that conversation
+ *
+ * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
+ */
+
+@Service(interfaces={ConversationalReferenceClient.class})
+public class ConversationalReferenceClientImpl implements ConversationalReferenceClient{
+   
+    public void incrementCount(CallableReference<ConversationalService> conversationalService){
+        ConversationalService callableReference = conversationalService.getService();
+        
+        callableReference.incrementCount();        
+    }
+
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
new file mode 100644
index 0000000000..9f4857f703
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.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.itest.conversational.impl;
+
+import java.util.HashMap;
+
+import org.apache.tuscany.sca.itest.conversational.BusinessException;
+import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
+import org.apache.tuscany.sca.itest.conversational.ConversationalService;
+import org.osoa.sca.annotations.Callback;
+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;
+
+
+/**
+ * The service used when testing stateful conversations
+ *
+ * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
+ */
+@Service(ConversationalService.class)
+@Scope("REQUEST")
+public class ConversationalServiceRequestImpl implements ConversationalService {
+    
+    @ConversationID
+    protected String conversationId;
+    
+    @Callback
+    protected ConversationalCallback conversationalCallback; 
+    
+    // static area in which to hold conversational data
+    private static HashMap<String, Integer> conversationalState = new HashMap<String, Integer>();
+   
+    // a static member variable that records the number of times this service is called
+    public static StringBuffer calls = new StringBuffer();
+   
+    @Init
+    public void init(){
+        calls.append("init,");
+    }
+    
+    @Destroy
+    public void destroy(){
+        calls.append("destroy,");
+    }
+    
+    public void initializeCount(int count){
+        calls.append("initializeCount,");
+        Integer conversationalCount = new Integer(count); 
+        conversationalState.put(conversationId, conversationalCount);
+    }
+    
+    public void incrementCount(){
+        calls.append("incrementCount,");
+        Integer conversationalCount = conversationalState.get(conversationId);
+        conversationalCount++;
+        conversationalState.put(conversationId, conversationalCount);
+    }
+    
+    public int retrieveCount(){
+        calls.append("retrieveCount,");
+        Integer count = conversationalState.get(conversationId);
+        if (count != null){
+            return count.intValue();
+        } else {
+            return -999;
+        }
+    }
+    
+    public void businessException() throws BusinessException {
+        throw new BusinessException("Business Exception");
+    }    
+    
+    public void initializeCountCallback(int count){
+        calls.append("initializeCountCallback,");
+        initializeCount(count);
+        conversationalCallback.initializeCount(count);
+    }
+    
+    public void incrementCountCallback(){
+        calls.append("incrementCountCallback,");
+        incrementCount();
+        conversationalCallback.incrementCount();
+    }
+    
+    public int retrieveCountCallback(){
+        calls.append("retrieveCountCallback,");
+        return conversationalCallback.retrieveCount();
+    }
+    
+    public void businessExceptionCallback() throws BusinessException {
+        calls.append("businessExceptionCallback,");        
+        conversationalCallback.businessException();
+    }
+    
+    public String endConversation(){
+        calls.append("endConversation,");
+        conversationalState.remove(conversationId);
+        return conversationId;
+    }
+    
+    public String endConversationCallback(){
+        calls.append("endConversationCallback,");       
+        return conversationalCallback.endConversation();
+    }   
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
new file mode 100644
index 0000000000..4b06251414
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.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.itest.conversational.impl;
+
+import org.apache.tuscany.sca.itest.conversational.BusinessException;
+import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
+import org.apache.tuscany.sca.itest.conversational.ConversationalService;
+import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.ConversationAttributes;
+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;
+
+
+/**
+ * The service used when testing stateful conversations
+ *
+ * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
+ */
+@Service(ConversationalService.class)
+@Scope("CONVERSATION")
+@ConversationAttributes(maxAge="10 minutes",
+                        maxIdleTime="5 minutes",
+                        singlePrincipal=false)
+public class ConversationalServiceStatefulImpl implements ConversationalService {
+
+    @ConversationID
+    protected String conversationId;
+    
+    @Callback
+    protected ConversationalCallback conversationalCallback; 
+    
+    // local count - accumulates during the conversation
+    private int count = 0;
+          
+    // a static member variable that records the number of times this service is called
+    public static StringBuffer calls = new StringBuffer();
+   
+    @Init
+    public void init(){
+        calls.append("init,");
+    }
+    
+    @Destroy
+    public void destroy(){
+        calls.append("destroy,");
+    }
+    
+    public void initializeCount(int count){
+        calls.append("initializeCount,");       
+        this.count = count;
+    }
+    
+    public void incrementCount(){
+        calls.append("incrementCount,");        
+        count++;
+    }
+    
+    public int retrieveCount(){
+        calls.append("retrieveCount,"); 
+        return count;
+    }
+    
+    public void businessException() throws BusinessException {
+        calls.append("businessException,");
+        throw new BusinessException("Business Exception");
+    }     
+    
+    public void initializeCountCallback(int count){
+        calls.append("initializeCountCallback,"); 
+        this.count = count;
+        conversationalCallback.initializeCount(count);
+    }
+    
+    public void incrementCountCallback(){
+        calls.append("incrementCountCallback,"); 
+        count++;
+        conversationalCallback.incrementCount();
+    }
+    
+    public int retrieveCountCallback(){
+        calls.append("retrieveCountCallback,"); 
+        return conversationalCallback.retrieveCount();
+    }
+    
+    public void businessExceptionCallback() throws BusinessException {
+        calls.append("businessExceptionCallback,");        
+        conversationalCallback.businessException();
+    }    
+    
+    public String endConversation(){
+        calls.append("endConversation,"); 
+        count = 0;
+        return conversationId;
+    }
+    
+    public String endConversationCallback(){
+        calls.append("endConversationCallback,"); 
+        return conversationalCallback.endConversation();
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
new file mode 100644
index 0000000000..be039748fc
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.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.itest.conversational.impl;
+
+import org.apache.tuscany.sca.itest.conversational.BusinessException;
+import org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback;
+import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;
+import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.ConversationAttributes;
+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;
+
+
+/**
+ * The service used when testing stateful conversations
+ *
+ * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
+ */
+@Service(ConversationalServiceNonConversationalCallback.class)
+@Scope("CONVERSATION")
+@ConversationAttributes(maxAge="10 minutes",
+                        maxIdleTime="5 minutes",
+                        singlePrincipal=false)
+public class ConversationalServiceStatefulNonConversationalCallbackImpl implements ConversationalServiceNonConversationalCallback {
+
+    @ConversationID
+    protected String conversationId;
+    
+    @Callback
+    protected NonConversationalCallback nonConversationalCallback; 
+    
+    // local count - accumulates during the conversation
+    private int count = 0;
+          
+    // a static member variable that records the number of times this service is called
+    public static StringBuffer calls = new StringBuffer();
+   
+    @Init
+    public void init(){
+        calls.append("init,");
+    }
+    
+    @Destroy
+    public void destroy(){
+        calls.append("destroy,");
+    }
+    
+    public void initializeCount(int count){
+        calls.append("initializeCount,");       
+        this.count = count;
+    }
+    
+    public void incrementCount(){
+        calls.append("incrementCount,");        
+        count++;
+    }
+    
+    public int retrieveCount(){
+        calls.append("retrieveCount,"); 
+        return count;
+    }
+    
+    public void businessException() throws BusinessException {
+        throw new BusinessException("Business Exception");
+    }     
+    
+    public void initializeCountCallback(int count){
+        calls.append("initializeCountCallback,"); 
+        this.count = count;
+        nonConversationalCallback.initializeCount(count);
+    }
+    
+    public void incrementCountCallback(){
+        calls.append("incrementCountCallback,"); 
+        count++;
+        nonConversationalCallback.incrementCount();
+    }
+    
+    public int retrieveCountCallback(){
+        calls.append("retrieveCountCallback,"); 
+        return nonConversationalCallback.retrieveCount();
+    }
+    
+    public void businessExceptionCallback() throws BusinessException {
+        calls.append("businessExceptionCallback,");        
+        nonConversationalCallback.businessException();
+    }    
+    
+    public String endConversation(){
+        calls.append("endConversation,"); 
+        count = 0;
+        return conversationId;
+    }
+    
+    public String endConversationCallback(){
+        calls.append("endConversationCallback,"); 
+        return nonConversationalCallback.endConversation();
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
new file mode 100644
index 0000000000..42f2f1a603
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
@@ -0,0 +1,122 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.conversational.impl;
+
+import java.util.HashMap;
+
+import org.apache.tuscany.sca.itest.conversational.BusinessException;
+import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
+import org.apache.tuscany.sca.itest.conversational.ConversationalService;
+import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.ConversationID;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Service;
+
+
+/**
+ * The service used when testing stateful conversations
+ *
+ * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
+ */
+@Service(ConversationalService.class)
+public class ConversationalServiceStatelessImpl implements ConversationalService {
+    
+    @ConversationID
+    protected String conversationId;
+    
+    @Callback
+    protected ConversationalCallback conversationalCallback; 
+    
+    // static area in which to hold conversational data
+    private static HashMap<String, Integer> conversationalState = new HashMap<String, Integer>();
+   
+    // a static member variable that records the number of times this service is called
+    public static StringBuffer calls = new StringBuffer();
+   
+    @Init
+    public void init(){
+        calls.append("init,");
+    }
+    
+    @Destroy
+    public void destroy(){
+        calls.append("destroy,");
+    }
+    
+    public void initializeCount(int count){
+        calls.append("initializeCount,");
+        Integer conversationalCount = new Integer(count); 
+        conversationalState.put(conversationId, conversationalCount);
+    }
+    
+    public void incrementCount(){
+        calls.append("incrementCount,");
+        Integer conversationalCount = conversationalState.get(conversationId);
+        conversationalCount++;
+        conversationalState.put(conversationId, conversationalCount);
+    }
+    
+    public int retrieveCount(){
+        calls.append("retrieveCount,");
+        Integer count = conversationalState.get(conversationId);
+        if (count != null){
+            return count.intValue();
+        } else {
+            return -999;
+        }
+    }
+    
+    public void businessException() throws BusinessException {
+        throw new BusinessException("Business Exception");
+    }    
+    
+    public void initializeCountCallback(int count){
+        calls.append("initializeCountCallback,");
+        initializeCount(count);
+        conversationalCallback.initializeCount(count);
+    }
+    
+    public void incrementCountCallback(){
+        calls.append("incrementCountCallback,");
+        incrementCount();
+        conversationalCallback.incrementCount();
+    }
+    
+    public int retrieveCountCallback(){
+        calls.append("retrieveCountCallback,");
+        return conversationalCallback.retrieveCount();
+    }
+    
+    public void businessExceptionCallback() throws BusinessException {
+        calls.append("businessExceptionCallback,");        
+        conversationalCallback.businessException();
+    }
+    
+    public String endConversation(){
+        calls.append("endConversation,");
+        conversationalState.remove(conversationId);
+        return conversationId;
+    }
+    
+    public String endConversationCallback(){
+        calls.append("endConversationCallback,");       
+        return conversationalCallback.endConversation();
+    }   
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
new file mode 100644
index 0000000000..a852aeda56
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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.conversational.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.sca.itest.conversational.BusinessException;
+import org.apache.tuscany.sca.itest.conversational.ConversationalService;
+import org.osoa.sca.annotations.ConversationID;
+import org.osoa.sca.annotations.Service;
+
+@Service(ConversationalService.class)
+public class ConversationalServiceStatelessScopeImpl implements ConversationalService {
+
+    @ConversationID
+    protected String cid;
+
+    static Map<String, Integer> state = new HashMap<String, Integer>();
+    
+    public void destroy() {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public String endConversation() {
+        state.remove(cid);
+        return cid;
+    }
+
+    public String endConversationCallback() {
+        // TODO Auto-generated method stub
+        return null;
+        
+    }
+
+    public void incrementCount() {
+        state.put(cid, Integer.valueOf(state.get(cid)+1));
+    }
+
+    public void businessException() throws BusinessException {
+        throw new BusinessException("Business Exception");
+    }
+    
+    public void incrementCountCallback() {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public void init() {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public void initializeCount(int count) {
+        state.put(cid, Integer.valueOf(count));
+    }
+
+    public void initializeCountCallback(int count) {
+        // TODO Auto-generated method stub
+        
+    }
+    
+    public void businessExceptionCallback() throws BusinessException {
+        throw new BusinessException("Business Exception");
+    }    
+
+    public int retrieveCount() {
+        return state.get(cid);
+    }
+
+    public int retrieveCountCallback() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+    
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..d5a1ff7410
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
@@ -0,0 +1,22 @@
+<?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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:conv="http://conversations">
+    <deployable composite="conv:ConversationalITest" />
+</contribution>
+\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/resources/Conversational/conversational.composite b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
new file mode 100644
index 0000000000..c4da99145d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
@@ -0,0 +1,169 @@
+<?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://conversations"
+	name="ConversationalITest">
+ 	      
+    <component name="ConversationalStatelessClientStatelessService">
+	    <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>
+        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>		
+		<reference name="conversationalService" target="ConversationalServiceStatelessSL">
+		    <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"
+                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />
+            <binding.ws/>
+            <callback>
+                <binding.ws uri="http://localhost:8085/ConversationalStatelessClientStatelessService"/>
+            </callback>
+        </reference>
+		<reference name="conversationalService2" target="ConversationalServiceStatelessSL">
+            <binding.ws/>
+        </reference> 		
+    </component>   
+    
+    <component name="ConversationalStatelessClientStatefulService">
+        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>
+        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       
+        <reference name="conversationalService" target="ConversationalServiceStateful">
+            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"
+                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />
+            <binding.ws/>
+            <callback>
+                <binding.ws uri="http://localhost:8085/ConversationalStatelessClientStatefulService"/>
+            </callback>
+        </reference>
+        <reference name="conversationalService2" target="ConversationalServiceStateful">  
+            <binding.ws/>
+        </reference>     
+    </component>     
+    
+    <component name="ConversationalStatefulClientStatelessService">
+        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl"/>
+        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       
+        <reference name="conversationalService" target="ConversationalServiceStatelessSL">
+            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"
+                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />
+            <binding.ws/>
+            <callback>
+                <binding.ws uri="http://localhost:8085/ConversationalStatefulClientStatelessService"/>
+            </callback>
+        </reference>
+        <reference name="conversationalService2" target="ConversationalServiceStatelessSL">
+            <binding.ws/>
+        </reference>        
+    </component>   
+    
+    <component name="ConversationalStatefulClientStatefulService">
+        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl"/>
+        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       
+        <reference name="conversationalService" target="ConversationalServiceStateful">
+            <binding.ws/>
+            <callback>
+                <binding.ws uri="http://localhost:8085/ConversationalStatefulClientStatefulService"/>
+            </callback>            
+        </reference>        
+        <reference name="conversationalService2" target="ConversationalServiceStateful">
+            <binding.ws/>
+        </reference>
+    </component>  
+    
+    <component name="ConversationalStatelessClientRequestService">
+	    <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>
+        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>		
+        <reference name="conversationalService" target="ConversationalServiceRequest">
+            <binding.ws/>
+            <callback>
+                <binding.ws uri="http://localhost:8085/ConversationalStatelessClientRequestService"/>
+            </callback>            
+        </reference>        
+        <reference name="conversationalService2" target="ConversationalServiceRequest">
+            <binding.ws/>
+        </reference>
+    </component> 
+    
+    <component name="ConversationalStatefulClientNonConversationalCallbackStatefulService">
+        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl"/>
+        <reference name="conversationalService" target="ConversationalServiceStatefulNonConversationalCallback">
+            <binding.ws/>
+            <callback>
+                <binding.ws uri="http://localhost:8085/ConversationalStatefulClientNonConversationalCallbackStatefulService"/>
+            </callback>            
+        </reference>        
+        <reference name="conversationalService2" target="ConversationalServiceStatefulNonConversationalCallback">
+            <binding.ws/>
+        </reference>
+    </component>     
+    
+    <component name="ConversationalReferenceClient">
+        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalReferenceClientImpl"/>
+    </component>    
+        
+    <component name="ConversationalServiceStateful">
+		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl"/>
+		<service name="ConversationalService">
+            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"
+                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />		
+		    <binding.ws uri="http://localhost:8085/ConversationalServiceStateful"/>
+            <callback>
+                <binding.ws/>
+            </callback>
+		</service>
+	</component>       
+   
+    <component name="ConversationalServiceStateless">
+		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessScopeImpl"/>
+	</component>  
+	
+    <component name="ConversationalServiceStatelessSL">
+        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl"/>
+        <service name="ConversationalService">
+            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"
+                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />       
+            <binding.ws uri="http://localhost:8085/ConversationalServiceStatelessSL"/>
+            <callback>
+                <binding.ws/>
+            </callback>
+        </service>        
+    </component> 
+
+    <component name="ConversationalServiceRequest">
+        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl"/>
+        <service name="ConversationalService">
+            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"
+                            callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />       
+            <binding.ws uri="http://localhost:8085/ConversationalServiceRequest"/>
+            <callback>
+                <binding.ws/>
+            </callback>
+        </service>            
+    </component> 
+    
+    <component name="ConversationalServiceStatefulNonConversationalCallback">
+		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl"/>
+        <service name="ConversationalServiceNonConversationalCallback">
+            <interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback"
+                            callbackInterface="org.apache.tuscany.sca.itest.conversational.NonConversationalCallback" />       
+            <binding.ws uri="http://localhost:8085/ConversationalServiceStatefulNonConversationalCallback"/>
+            <callback>
+                <binding.ws/>
+            </callback>
+        </service> 		
+	</component>   
+
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
new file mode 100644
index 0000000000..20a92c9dc7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
@@ -0,0 +1,383 @@
+<?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.    
+-->
+<wsdl:definitions targetNamespace="http://conversational.itest.sca.tuscany.apache.org" 
+                  xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" 
+                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+                  xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
+                  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+                  xmlns:ns0="http://conversational.itest.sca.tuscany.apache.org" 
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+                  xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
+                  xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" 
+                  xmlns:ns1="http://org.apache.axis2/xsd">
+  <wsdl:types>
+    <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://conversational.itest.sca.tuscany.apache.org" xmlns:ns="http://conversational.itest.sca.tuscany.apache.org">
+            <xs:element name="retrieveCountResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" type="xs:int"/>
+                    </xs:sequence>
+                </xs:complexType>
+
+            </xs:element>
+            <xs:element name="retrieveCountCallbackResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" type="xs:int"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="endConversationResponse">
+
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="endConversationCallbackResponse">
+                <xs:complexType>
+                    <xs:sequence>
+
+                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="initializeCount">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="param0" type="xs:int"/>
+                    </xs:sequence>
+
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="initializeCountCallback">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="param0" type="xs:int"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+
+        <xs:element name="retrieveCount"><xs:complexType/></xs:element><xs:element name="endConversation"><xs:complexType/></xs:element><xs:element name="endConversationCallback"><xs:complexType/></xs:element><xs:element name="incrementCountCallback"><xs:complexType/></xs:element><xs:element name="incrementCountCallbackResponse"><xs:complexType/></xs:element><xs:element name="incrementCount"><xs:complexType/></xs:element><xs:element name="incrementCountResponse"><xs:complexType/></xs:element><xs:element name="initializeCountCallbackResponse"><xs:complexType/></xs:element><xs:element name="initializeCountResponse"><xs:complexType/></xs:element><xs:element name="retrieveCountCallback"><xs:complexType/></xs:element></xs:schema>
+  </wsdl:types>
+  <wsdl:message name="initializeCountCallbackResponse">
+    <wsdl:part name="parameters" element="ns0:initializeCountCallbackResponse">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="retrieveCountCallbackRequest">
+    <wsdl:part name="parameters" element="ns0:retrieveCountCallback">
+    </wsdl:part>
+
+  </wsdl:message>
+  <wsdl:message name="incrementCountRequest">
+    <wsdl:part name="parameters" element="ns0:incrementCount">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="incrementCountCallbackResponse">
+    <wsdl:part name="parameters" element="ns0:incrementCountCallbackResponse">
+    </wsdl:part>
+  </wsdl:message>
+
+  <wsdl:message name="retrieveCountCallbackResponse">
+    <wsdl:part name="parameters" element="ns0:retrieveCountCallbackResponse">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="retrieveCountResponse">
+    <wsdl:part name="parameters" element="ns0:retrieveCountResponse">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="endConversationResponse">
+
+    <wsdl:part name="parameters" element="ns0:endConversationResponse">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="endConversationCallbackRequest">
+    <wsdl:part name="parameters" element="ns0:endConversationCallback">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="incrementCountCallbackRequest">
+    <wsdl:part name="parameters" element="ns0:incrementCountCallback">
+
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="retrieveCountRequest">
+    <wsdl:part name="parameters" element="ns0:retrieveCount">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="initializeCountRequest">
+    <wsdl:part name="parameters" element="ns0:initializeCount">
+    </wsdl:part>
+
+  </wsdl:message>
+  <wsdl:message name="initializeCountResponse">
+    <wsdl:part name="parameters" element="ns0:initializeCountResponse">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="endConversationCallbackResponse">
+    <wsdl:part name="parameters" element="ns0:endConversationCallbackResponse">
+    </wsdl:part>
+  </wsdl:message>
+
+  <wsdl:message name="endConversationRequest">
+    <wsdl:part name="parameters" element="ns0:endConversation">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="initializeCountCallbackRequest">
+    <wsdl:part name="parameters" element="ns0:initializeCountCallback">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="incrementCountResponse">
+
+    <wsdl:part name="parameters" element="ns0:incrementCountResponse">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:portType name="ConversationalServicePortType">
+    <wsdl:operation name="retrieveCount">
+      <wsdl:input message="ns0:retrieveCountRequest" wsaw:Action="urn:retrieveCount">
+    </wsdl:input>
+      <wsdl:output message="ns0:retrieveCountResponse" wsaw:Action="urn:retrieveCountResponse">
+    </wsdl:output>
+
+    </wsdl:operation>
+    <wsdl:operation name="endConversation">
+      <wsdl:input message="ns0:endConversationRequest" wsaw:Action="urn:endConversation">
+    </wsdl:input>
+      <wsdl:output message="ns0:endConversationResponse" wsaw:Action="urn:endConversationResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="endConversationCallback">
+      <wsdl:input message="ns0:endConversationCallbackRequest" wsaw:Action="urn:endConversationCallback">
+
+    </wsdl:input>
+      <wsdl:output message="ns0:endConversationCallbackResponse" wsaw:Action="urn:endConversationCallbackResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="incrementCountCallback">
+      <wsdl:input message="ns0:incrementCountCallbackRequest" wsaw:Action="urn:incrementCountCallback">
+    </wsdl:input>
+      <wsdl:output message="ns0:incrementCountCallbackResponse" wsaw:Action="urn:incrementCountCallbackResponse">
+    </wsdl:output>
+
+    </wsdl:operation>
+    <wsdl:operation name="incrementCount">
+      <wsdl:input message="ns0:incrementCountRequest" wsaw:Action="urn:incrementCount">
+    </wsdl:input>
+      <wsdl:output message="ns0:incrementCountResponse" wsaw:Action="urn:incrementCountResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="initializeCountCallback">
+      <wsdl:input message="ns0:initializeCountCallbackRequest" wsaw:Action="urn:initializeCountCallback">
+
+    </wsdl:input>
+      <wsdl:output message="ns0:initializeCountCallbackResponse" wsaw:Action="urn:initializeCountCallbackResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="initializeCount">
+      <wsdl:input message="ns0:initializeCountRequest" wsaw:Action="urn:initializeCount">
+    </wsdl:input>
+      <wsdl:output message="ns0:initializeCountResponse" wsaw:Action="urn:initializeCountResponse">
+    </wsdl:output>
+
+    </wsdl:operation>
+    <wsdl:operation name="retrieveCountCallback">
+      <wsdl:input message="ns0:retrieveCountCallbackRequest" wsaw:Action="urn:retrieveCountCallback">
+    </wsdl:input>
+      <wsdl:output message="ns0:retrieveCountCallbackResponse" wsaw:Action="urn:retrieveCountCallbackResponse">
+    </wsdl:output>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="ConversationalServiceSOAP11Binding" type="ns0:ConversationalServicePortType">
+
+    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="retrieveCount">
+      <soap:operation soapAction="urn:retrieveCount" style="document"/>
+      <wsdl:input>
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal"/>
+      </wsdl:output>
+
+    </wsdl:operation>
+    <wsdl:operation name="endConversation">
+      <soap:operation soapAction="urn:endConversation" style="document"/>
+      <wsdl:input>
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal"/>
+      </wsdl:output>
+
+    </wsdl:operation>
+    <wsdl:operation name="endConversationCallback">
+      <soap:operation soapAction="urn:endConversationCallback" style="document"/>
+      <wsdl:input>
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal"/>
+      </wsdl:output>
+
+    </wsdl:operation>
+    <wsdl:operation name="incrementCountCallback">
+      <soap:operation soapAction="urn:incrementCountCallback" style="document"/>
+      <wsdl:input>
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal"/>
+      </wsdl:output>
+
+    </wsdl:operation>
+    <wsdl:operation name="incrementCount">
+      <soap:operation soapAction="urn:incrementCount" style="document"/>
+      <wsdl:input>
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal"/>
+      </wsdl:output>
+
+    </wsdl:operation>
+    <wsdl:operation name="initializeCountCallback">
+      <soap:operation soapAction="urn:initializeCountCallback" style="document"/>
+      <wsdl:input>
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal"/>
+      </wsdl:output>
+
+    </wsdl:operation>
+    <wsdl:operation name="initializeCount">
+      <soap:operation soapAction="urn:initializeCount" style="document"/>
+      <wsdl:input>
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal"/>
+      </wsdl:output>
+
+    </wsdl:operation>
+    <wsdl:operation name="retrieveCountCallback">
+      <soap:operation soapAction="urn:retrieveCountCallback" style="document"/>
+      <wsdl:input>
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal"/>
+      </wsdl:output>
+
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:binding name="ConversationalServiceHttpBinding" type="ns0:ConversationalServicePortType">
+    <http:binding verb="POST"/>
+    <wsdl:operation name="retrieveCount">
+      <http:operation location="ConversationalService/retrieveCount"/>
+      <wsdl:input>
+        <mime:content part="retrieveCount" type="text/xml"/>
+      </wsdl:input>
+
+      <wsdl:output>
+        <mime:content part="retrieveCount" type="text/xml"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="endConversation">
+      <http:operation location="ConversationalService/endConversation"/>
+      <wsdl:input>
+        <mime:content part="endConversation" type="text/xml"/>
+      </wsdl:input>
+
+      <wsdl:output>
+        <mime:content part="endConversation" type="text/xml"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="endConversationCallback">
+      <http:operation location="ConversationalService/endConversationCallback"/>
+      <wsdl:input>
+        <mime:content part="endConversationCallback" type="text/xml"/>
+      </wsdl:input>
+
+      <wsdl:output>
+        <mime:content part="endConversationCallback" type="text/xml"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="incrementCountCallback">
+      <http:operation location="ConversationalService/incrementCountCallback"/>
+      <wsdl:input>
+        <mime:content part="incrementCountCallback" type="text/xml"/>
+      </wsdl:input>
+
+      <wsdl:output>
+        <mime:content part="incrementCountCallback" type="text/xml"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="incrementCount">
+      <http:operation location="ConversationalService/incrementCount"/>
+      <wsdl:input>
+        <mime:content part="incrementCount" type="text/xml"/>
+      </wsdl:input>
+
+      <wsdl:output>
+        <mime:content part="incrementCount" type="text/xml"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="initializeCountCallback">
+      <http:operation location="ConversationalService/initializeCountCallback"/>
+      <wsdl:input>
+        <mime:content part="initializeCountCallback" type="text/xml"/>
+      </wsdl:input>
+
+      <wsdl:output>
+        <mime:content part="initializeCountCallback" type="text/xml"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="initializeCount">
+      <http:operation location="ConversationalService/initializeCount"/>
+      <wsdl:input>
+        <mime:content part="initializeCount" type="text/xml"/>
+      </wsdl:input>
+
+      <wsdl:output>
+        <mime:content part="initializeCount" type="text/xml"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="retrieveCountCallback">
+      <http:operation location="ConversationalService/retrieveCountCallback"/>
+      <wsdl:input>
+        <mime:content part="retrieveCountCallback" type="text/xml"/>
+      </wsdl:input>
+
+      <wsdl:output>
+        <mime:content part="retrieveCountCallback" type="text/xml"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="ConversationalService">
+    <wsdl:port name="ConversationalServiceSOAP11port_http" binding="ns0:ConversationalServiceSOAP11Binding">
+      <soap:address location="http://localhost:8085/ConversationalServiceStateful"/>
+    </wsdl:port>
+
+    <wsdl:port name="ConversationalServiceHttpport" binding="ns0:ConversationalServiceHttpBinding">
+      <http:address location="http://localhost:8085/ConversationalServiceStateful"/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..73d078674c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
@@ -0,0 +1,22 @@
+<?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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:conv="http://conversations">
+    <deployable composite="conv:ConversationalWSDLITest" />
+</contribution>
+\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
new file mode 100644
index 0000000000..9c6b0a2b34
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.2/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.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://conversations"
+	name="ConversationalWSDLITest">
+ 	      
+    <component name="ConversationalStatelessClientStatefulService">
+        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>
+        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       
+        <reference name="conversationalService" target="ConversationalServiceStateful">
+           <binding.ws wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.port(ConversationalService/ConversationalServiceSOAP11port_http)"/>
+        </reference>
+        <reference name="conversationalService2" target="ConversationalServiceStateful">  
+            <binding.ws wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.port(ConversationalService/ConversationalServiceSOAP11port_http)"/>
+        </reference>     
+    </component>     
+       
+    <component name="ConversationalServiceStateful">
+		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl"/>
+		<service name="ConversationalService">
+		    <binding.ws wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.port(ConversationalService/ConversationalServiceSOAP11port_http)"/>
+		</service>
+    </component>  
+      
+    <component name="ConversationalReferenceClient">
+        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalReferenceClientImpl"/>
+    </component> 
+   
+</composite>