summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-0.99/itest/conversations/src/main/java/org/apache')
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java50
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java48
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java36
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java62
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java75
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java47
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdService.java29
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java75
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java249
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java243
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java43
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java117
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java121
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScope.java93
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java37
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java69
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java34
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java31
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.java30
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java496
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java38
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java97
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java43
-rw-r--r--branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java147
24 files changed, 0 insertions, 2310 deletions
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
deleted file mode 100644
index 640ec22a4f..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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 caonversational 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 Exception;
-
- @EndsConversation
- public String endConversation();
-
-}
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
deleted file mode 100644
index dbe51bcbea..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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 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 int runConversationAgeTimeout();
- public int runConversationIdleTimeout();
- public int runConversationPrincipleError();
-
-}
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
deleted file mode 100644
index 8f008fa711..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
deleted file mode 100644
index 546382cfd1..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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 init();
-
- public void destroy();
-
- public void initializeCount(int count);
-
- public void incrementCount();
-
- public int retrieveCount();
-
- public void businessException() throws Exception;
-
- public void initializeCountCallback(int count);
-
- public void incrementCountCallback();
-
- public int retrieveCountCallback();
-
- public void businessExceptionCallback() throws Exception;
-
- @EndsConversation
- public String endConversation();
-
- public String endConversationCallback();
-
-}
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
deleted file mode 100644
index 9deef312ac..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.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 Exception {
- }
-
- public void businessExceptionCallback() throws Exception {
- }
-
- 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/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
deleted file mode 100644
index 1196b6ac0d..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.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/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdService.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdService.java
deleted file mode 100644
index 11d5ea186b..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.osoa.sca.annotations.Conversational;
-
-@Conversational
-public interface ConversationIdService {
-
- String getCIDField();
- String getCIDSetter();
-}
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
deleted file mode 100644
index 1272c7ab7f..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.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 Exception {
- }
-
- public void businessExceptionCallback() throws Exception {
- }
-
- 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/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
deleted file mode 100644
index 4e2c721040..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.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 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 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 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 Exception {
- throw new Exception("Business Exception");
- }
-
- public String endConversation(){
- calls.append("endConversation,");
- return null;
- }
-
-}
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
deleted file mode 100644
index 1470c699c0..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.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 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 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");
- 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,");
- 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 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 Exception {
- throw new Exception("Business Exception");
- }
-
- public String endConversation(){
- calls.append("endConversation,");
- return null;
- }
-
-}
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
deleted file mode 100644
index 8fe7c5b6ba..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
deleted file mode 100644
index efcbdff06f..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.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 Exception {
- throw new Exception("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 Exception {
- 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/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
deleted file mode 100644
index dca0596b87..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.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 Exception {
- throw new Exception("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 Exception {
- 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/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScope.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScope.java
deleted file mode 100644
index b1332833bb..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScope.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.ConversationalService;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationalService.class)
-public class ConversationalServiceStatelessScope 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 Exception {
- throw new Exception("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 Exception {
- throw new Exception("Business Exception");
- }
-
- public int retrieveCount() {
- return state.get(cid);
- }
-
- public int retrieveCountCallback() {
- // TODO Auto-generated method stub
- return 0;
- }
-
-}
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java
deleted file mode 100644
index 90c674c6ac..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Conversational
-/**
- *
- */
-public interface AnotherService {
-
- public void setService(ServiceReference aServiceReference);
- public void add(int anInt);
- public int getCount();
-
-}
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java
deleted file mode 100644
index 027109787a..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(AnotherService.class)
-@Scope("CONVERSATION")
-
-public class AnotherServiceImpl implements AnotherService {
-
- // This is a simple pass-thru service used to test propogation
- // of ServiceReference and maintenance of Session state.
-
- private ServiceReference aServiceReference;
-
- public void add(int anInt) {
-
- Assert.assertNotNull("AnotherServiceImpl - add ", aServiceReference);
- ((ConversationsService) aServiceReference).add(anInt);
-
- }
-
-
- public void initializeCount() {
-
- Assert.assertNotNull("AnotherServiceImpl - initializeCount ", aServiceReference);
- ((ConversationsService) aServiceReference).initializeCount();
-
- }
-
-
- public void setService(ServiceReference aRef) {
-
- Assert.assertNotNull("AnotherServiceImpl - setService ", aRef);
- aServiceReference = aRef;
-
- }
-
-
- public int getCount() {
-
- Assert.assertNotNull("AnotherServiceImpl - getCount ", aServiceReference);
- return ((ConversationsService) aServiceReference).getLocalCount();
- }
-
-
-}
-
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java
deleted file mode 100644
index 18e935e089..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Conversational;
-
-@Conversational
-/**
- *
- *
- */
-public interface ConversationsCallback {
-
- public void callBackMessage(String aString);
- public void callBackIncrement(String aString);
- public void callBackEndSession();
-
-}
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java
deleted file mode 100644
index ff677db74d..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Conversational
-public interface ConversationsClient {
-
- public void run();
- public int count();
-
-}
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.java
deleted file mode 100644
index 389b1f4d93..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Conversational
-public interface ConversationsClient2 {
- public String getDateTime();
-
-
-}
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java
deleted file mode 100644
index 54a437e66a..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.test;
-
-import java.io.File;
-import java.text.DateFormat;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ConversationEndedException;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(interfaces={ConversationsClient.class,ConversationsClient2.class})
-
-
-@Scope("CONVERSATION")
-@ConversationAttributes(maxIdleTime="10 minutes",
- singlePrincipal=false)
-
-
-public class ConversationsClientImpl implements ConversationsClient, ConversationsClient2, ConversationsCallback {
-
- @Reference
- protected ConversationsService aService;
- @Reference
- protected AnotherService anotherService;
- @Reference
- protected ConversationsLifeCycleService aLifeCycleService;
- @Context
- protected ComponentContext myContext;
- @ConversationID
- protected String conversationID;
-
- private Object monitor = new Object();
- private int count=0;
- private String message;
- private String initialState;
- private int initialCount = 56;
- private String dateTime;
- private final static String markerFileName = "target/testConversations_test3_marker";
-
- public ConversationsClientImpl() {
- System.out.println("xxxxxxxxxx");
- }
-
- public void run() {
-
- // This tests various aspects of session lifecycle and maintenance of session state.
- // None of these test are working due to various issues.
-
- /* test0()
- This test verifies annotations and API's for ConversationID.
- */
- test0(); // - Tuscany-1001.
-
- /* test1()
- Test stateful callbacks. Verify that the client�s state is maintained throughout the execution of
- all callback methods.
- */
- test1(); // This test is working for MODULE scope. Cant claim succcess because it needs Conversation scope.
-
- /* test2()
- Test each method of starting a session. Test @Init.
- */
- test2(); // Tuscany-965, Tuscany-1001
-
- /* test3()
- Test each method of ending a session. Test @Destroy.
- */
- test3(); // Tuscany-965, Tuscany-1001
-
- /* test4()
- Pass an existing service reference with an active session to another service. Verify the session is maintained
- */
- test4(); // Tuscany-964, Tuscant-1001
-
- /* test5()
- Call the createServiceReferenceForSession() API to get a service reference for the active session.
- Pass the service reference to another service. Verify the session is maintained.
- */
- test5();
-
- /* test6()
- * Allow a session to timeout.
- */
- test6(); // Tuscany-965, Tuscany-1001
-
-
- return;
- }
-
- private void test0()
- {
-
- // Verify that conversationID was injected.
- Assert.assertNotNull("test0 - conversationID injected", conversationID);
- System.out.println("ConversationID: " + conversationID);
-
- //
- // The client may access the ConversationID by calling getConversationID on a Service Reference.
- // This also verifies a session was created during injection of this Service Reference.
- //
- // TODO: this fails as the cid is null as a conversation has not been started yet (which seems expected to me)
-// ServiceReference<ConversationsService> aServiceserviceRef = myContext.getServiceReference(ConversationsService.class, "aService");
-// System.out.println("aServices cid: " + aServiceserviceRef.getConversationID());
-// Assert.assertNotNull("test0 - ConversationID from service reference", aServiceserviceRef.getConversationID());
-
- //FIXME Port to the 1.0 spec API
- //Object aLifeCycleServicesSessionID =((ServiceReference)aLifeCycleService).getSessionID();
- //Assert.assertNotNull("test0 - ConversationID from LifeCycleService service reference", aLifeCycleServicesSessionID);
-
- // This will verify the @Init() is working for a session created during injection. See test2().
- aLifeCycleService.knockKnock("Hello");
-
- }
-
- private void test1()
- {
-
- //
- // This test verifies that the state of the client is preserved across method calls. Each
- // call to the service results in 2 callbacks. One to increment a count and the other to set a string.
- // At the end of the test the count should equal 5 and the string should be set. Also the original strings
- // values should be preserved.
- //
- //
- initialState = "Initial State";
-
- int numCalls = 0;
-
- for(int i=0; i < 10; i++)
- {
- aService.knockKnock("Knock Knock " + ++numCalls);
- }
-
- // I want to drive multiple callbacks and then give them time to complete. Don't want to
- // force serialization. After 20 seconds check the assertions.
-
- synchronized(monitor)
- {
- try
- {
- monitor.wait(2000L);
- }
- catch (Exception ex)
- {ex.printStackTrace();}
- }
-
- // Here we test for the expected state of several different variables. State needs to be maintained
- // across method calls to the service. If the same client instance is used then the state should match
- // the following assertions.
-
- // instance variable count should equal the number of calls to the backend service. count is incremented
- // during callback processing.
- Assert.assertEquals("Conversations - Test1 count", numCalls, count);
- // The returned message should be like the following.
- Assert.assertEquals("Conversations - Test1 message", true, message.startsWith("Who's There"));
- // any initial state set prior to running the callbacks should be maintained.
- Assert.assertEquals("Conversations - Test1 initialState", "Initial State", initialState);
- Assert.assertEquals("Conversations - Test1 initialCount", 56, initialCount);
-
- return;
-
- }
-
- private void test2()
- {
-
- // Verify the various methods to create a new Session.
- // Sesssions can be started:
- //
- // 1) When a service reference is injected into a client. This is verified in test0().
- // 2) By the client calling newSession() API with and without a ConversationID.
- //
- // Verify init() is called prior to any business methods. This is performed in the Service when any
- // business methos is called.
-
- Assert.assertNotNull("current composite context",myContext);
-
- // This tests creating a conversational session. And that @Init is run prior to business method.
- ServiceReference aServRef = null;
- //FIXME Port to the 1.0 spec API
- //aServRef = myContext.newSession("ConversationsLifeCycleService");
-// Assert.assertNotNull("Conversations - Test2 Service Reference 1 not returned", aServRef);
-
- //FIXME Port to the 1.0 spec API
- //Get the session ID.
- //Object aConversationID = aServRef.getSessionID();
- ConversationsLifeCycleService aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef;
- aConversationsLifeCycleService.knockKnock("Hello");
-
- //Create a new session this time specifying a session ID. Verify the seesion id is what was specified.
- //FIXME Port to the 1.0 spec API
- //aServRef = myContext.newSession("ConversationsLifeCycleService","Test2-12345");
- Assert.assertNotNull("Conversations - Test2 Service Reference 2 not returned", aServRef);
- //FIXME Port to the 1.0 spec API
- //Get the session ID.
- //Object aConversationID2 = aServRef.getSessionID();
- //Assert.assertEquals("Conversations - Test2 Session not created with specified ConversationID", "Test2-12345", aConversationID2);
- aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef;
- aConversationsLifeCycleService.knockKnock("Hello");
-
- //FIXME Port to the 1.0 spec API
- //Assert.assertNotSame("Conversations - Test2 sessions are not different", aConversationID, aConversationID2);
-
- }
-
- private void test3()
- {
-
- // Note: The @EndSesion and @EndsConversation anotations are not implemented.
- // So #1 an #2 cannot be done.
-
- //
- // Verify the various methods to end a session.
- // Sesssions can be ended:
- //
- // 1) Server operation annotated with @EndsConversation.
- // 2) Server operation calls an @EndSession annotated callback method.
- // 3) Servers conversation lifetime times out. This is test6() so its not implimented in the test3 method.
- // 4) The client calls ServiceReference.endSession();
- //
- // Verify @Destroy annotated method get called after completion of the business
- // method that called the endSession.
- //
-
- ConversationsLifeCycleService aConversationsLifeCycleService;
-//FIXME Port to the 1.0 spec API
-// Object aConversationID;
- Assert.assertNotNull("current composite context",myContext);
- ServiceReference aServRef;
- this.removeMarkerFile();
-
- //
- // test3 variation #1 - Cannot be done annotation not implimented yet. 12/15/2006
- //
-
- //FIXME Port to the 1.0 spec API
- //aServRef = myContext.newSession("ConversationsLifeCycleService");
- aServRef = null;
- Assert.assertNotNull("Conversations - Test3-1 Service Reference not returned", aServRef);
-
- aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef;
- aConversationsLifeCycleService.knockKnock("Hello");
- //FIXME Port to the 1.0 spec API
- //aConversationID = aServRef.getSessionID();
- //Assert.assertNotNull("Conversations - Test3-1 ConversationID not found", aConversationID);
-
- //Call the business method annotated with @EndsConversation.
- aConversationsLifeCycleService.endThisSession(); // This should also drive @Destroy method.
-
- // Verify session has ended. The ConversationID should be null;
- //FIXME Port to the 1.0 spec API
- //aConversationID = aServRef.getSessionID();
- //Assert.assertNull("Conversations - Test3-1 session not null after endSession()", aConversationID);
-
- // Verify Destroy was run. The baxckend service creates a marker file when @Destroy annotated method is run.
- Assert.assertEquals("Conversations - Test3-1 @Destroy method not invoked", true, this.isMarkerFilePresent());
- this.removeMarkerFile();
-
- //
- // test3 variation #2 - Cannot be done annotation not implimented yet. 12/15/2006
- //
-
- //FIXME Port to the 1.0 spec API
- //aServRef = myContext.newSession("ConversationsLifeCycleService");
- Assert.assertNotNull("Conversations - Test3-2 Service Reference not returned", aServRef);
-
- aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef;
- aConversationsLifeCycleService.knockKnock("Hello");
- //FIXME Port to the 1.0 spec API
- //aConversationID = aServRef.getSessionID();
- //Assert.assertNotNull("Conversations - Test3-2 ConversationID not found", aConversationID);
-
- //Call the business method that will invoke my @EndSession callback method.
- aConversationsLifeCycleService.endThisSessionUsingCallback(); // This should also drive @Destroy method.
-
- // Verify session has ended. The ConversationID should be null;
- //FIXME Port to the 1.0 spec API
- //aConversationID = aServRef.getSessionID();
- //Assert.assertNull("Conversations - Test3-2 session not null after endSession()", aConversationID);
-
- // Verify Destroy was run. The baxckend service creates a marker file when @Destroy annotated method is run.
- Assert.assertEquals("Conversations - Test3-2 @Destroy method not invoked", true, this.isMarkerFilePresent());
- this.removeMarkerFile();
-
- //
- // test3 variation #4 - Client calls endSession()
- //
-
- //FIXME Port to the 1.0 spec API
- //aServRef = myContext.newSession("ConversationsLifeCycleService");
- aServRef = null;
- Assert.assertNotNull("Conversations - Test3-4 Service Reference not returned", aServRef);
-
- aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef;
- aConversationsLifeCycleService.knockKnock("Hello");
- //FIXME Port to the 1.0 spec API
- //aConversationID = aServRef.getSessionID();
- //Assert.assertNotNull("Conversations - Test3-4 ConversationID not found", aConversationID);
-
- //Call the endSession() API on the Service Reference.
- //FIXME Port to the 1.0 spec API
- //aServRef.endSession(); // This should also drive @Destroy method.
-
- // Verify session has ended. The ConversationID should be null;
- //FIXME Port to the 1.0 spec API
- //aConversationID = aServRef.getSessionID();
- //Assert.assertNull("Conversations - Test3-4 session not null after endSession()", aConversationID);
-
- // Verify Destroy was run. The baxckend service creates a marker file when @Destroy annotated method is run.
- Assert.assertEquals("Conversations - Test3-4 @Destroy method not invoked", true, this.isMarkerFilePresent());
- this.removeMarkerFile();
- }
-
- public void test4()
- {
-
- //
- // This test uses the injected active session for the ConversationsService. It starts a conversation
- // in this method building up state with a counter. It then passes this reference to another backend service adding
- // additional state. It then returns and adds more state using original service and then performs the Assertions.
- //
-
- aService.initializeCount();
- aService.add(1);
- anotherService.setService((ServiceReference)aService);
- anotherService.add(1);
- anotherService.add(1);
- aService.add(1);
- aService.add(1);
- int count = anotherService.getCount();
-
- Assert.assertEquals("test4 - ConversationsClientImpl ", 5, count);
-
- return;
- }
-
-
- public void test5()
- {
-
- // The first test verifies that the createServiceReferenceForSession(this) API is functioning.
- // This is done in the backend serviced as it needs a single interface defined. The 2nd test
- // uses the variant of this API when > 1 interfaces are implemented.
- //
- // The 2nd test obtains a service reference for myself and passes that reference to a backend service.
- // The backend service then invokes the count() method on my service reference. It then returns
- // the count that it retrieved. The test then asserts that the count returned from the backend
- // service matches the client services internal state.
- //
-
- Assert.assertNotNull("current composite context",myContext);
-
- boolean result = aService.createServiceReferenceForSelf();
- System.out.println("Laa: returned from createServiceReferenceForSelf() " + result);
- Assert.assertEquals("test5 - createServiceReferenceForSelf",true,result);
-
- count = 6;
- int returnCount = 0;
- //FIXME Port to the 1.0 spec API
- //ServiceReference myServiceReference = myContext.createServiceReferenceForSession(this,"ConversationsClient2");
- ServiceReference myServiceReference = null;
- Assert.assertNotNull("test5 - createServiceReferenceForSession - myContext.createServiceReferenceForSession(this,ConversationsClient);", myServiceReference);
- returnCount = aService.getCount(myServiceReference);
-
- Assert.assertEquals("test5 - createServiceReferenceForSession(this,ConversationsClient2)",count,returnCount);
- String aRemoteDateTime = aService.getDateTime(myServiceReference);
- Assert.assertEquals("test5 - createServiceReferenceForSession(this,ConversationsClient2 - dateTime)", dateTime, aRemoteDateTime);
-
- return;
- }
-
- public void test6()
- {
-
- //
- // Create a session and allow it to timeout and verify that it did.
- // Invoking a business method on a service that has timed out should result in
- // a SessionEndedException.
- //
-
- Assert.assertNotNull("current composite context",myContext);
-
- // This tests creating a conversational session. This service has a maxAge="5 seconds".
- ServiceReference aServRef;
- //FIXME Port to the 1.0 spec API
- //aServRef = myContext.newSession("ConversationsLifeCycleService");
- aServRef = null;
- Assert.assertNotNull("Conversations - Test6 Service Reference not returned", aServRef);
-
- // Run a business method.
- ConversationsLifeCycleService aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef;
- aConversationsLifeCycleService.knockKnock("Hello");
-
- //
- // wait 10 seconds so session will time out.
- //
- try {
- Thread.sleep(10000L);
- }
- catch (InterruptedException ex)
- {
- ex.printStackTrace();
- }
-
- // Run a busineess method after timeout period has elapsed.
- boolean sessionEnded = false;
- try
- {
- aConversationsLifeCycleService.knockKnock("Hello");
- }
- catch (ConversationEndedException sex)
- {
- sessionEnded = true;
- }
-
- Assert.assertEquals("Conversations - Test6 Session did not timeout ", true, sessionEnded);
-
- return;
- }
-
-
- public synchronized void callBackIncrement(String aString) {
-
- count++;
- System.out.println("Laa: callBackIncrement invoked on client. count = " + count);
-
- }
-
- public synchronized void callBackMessage(String aString) {
-
- message = aString;
- System.out.println("Laa: callBackIMessage invoked on client. message = " + message);
-
- }
-
- // @EndSession - This is for test3() variation #2.
- public void callBackEndSession() {
-
- System.out.println("Laa: callBackEndSession method invoked on client.");
-
- }
-
- public int count()
- {
- return this.count;
- }
-
- public String getDateTime() {
-
- dateTime = DateFormat.getDateTimeInstance().toString();
- return dateTime;
-
- }
-
- private void removeMarkerFile()
- {
- // Make sure the marker file is not present before starting the test.
- File aFile = new File(markerFileName);
- if (aFile.exists())
- aFile.delete();
- }
-
- private boolean isMarkerFilePresent()
- {
- File aFile = new File(markerFileName);
- return aFile.exists();
- }
-
-
-
-}
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java
deleted file mode 100644
index 26dfcd9a38..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(ConversationsCallback.class)
-@Conversational
-
-/**
- *
- */
-public interface ConversationsLifeCycleService {
-
- public String knockKnock(String aString);
- public void endThisSession();
- public void endThisSessionUsingCallback();
-
-}
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java
deleted file mode 100644
index 7f38e356f6..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.test;
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationsLifeCycleService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="5 seconds")
-
-// This is a short-lived conversational service.
-
-public class ConversationsLifeCycleServiceImpl implements ConversationsLifeCycleService {
-
- @Callback
- protected ConversationsCallback callback;
-
- private String state = "NOT READY";
- private final static String markerFileName = "target/testConversations_test3_marker";
-
-
- public String knockKnock(String aString) {
-
- // Prior to any business methods being invoked the state must have been set to READY using the @Init.
- System.out.println("ConversationsLifeCycleServiceImpl.knockKnock - State = " + state);
- Assert.assertEquals("ConversationsLifeCycleServiceImpl.knockKnock - not in READY state ", "READY", state);
-
- return "Who's There!";
- }
-
- @Init
- public void init()
- {
- state = "READY";
- System.out.println("ConversationsLifeCycleServiceImpl.init()");
- }
-
-
- @Destroy
- public void destroy()
- {
- state = "DESTROYED";
-
- File aFile = new File(markerFileName);
- try
- {
- aFile.createNewFile();
- }
- catch (Exception ex)
- {
- System.out.println("Error Creating " + markerFileName);
- ex.printStackTrace();
- }
- System.out.println("ConversationsLifeCycleServiceImpl.destroy()");
- }
-
-// @EndsConversation
- public void endThisSession() {
- //This method will end the current session by annotation.
- System.out.println("ConversationsLifeCycleServiceImpl.endThisSession()");
-
- }
-
- public void endThisSessionUsingCallback() {
-
- //This method will end the current session by a callback method annotated with @EndSession.
- callback.callBackEndSession();
- System.out.println("ConversationsLifeCycleServiceImpl.endThisSessionUsingCallback()");
- }
-
-}
-
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java
deleted file mode 100644
index f878e22bf8..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(ConversationsCallback.class)
-@Conversational
-
-/**
- *
- */
-public interface ConversationsService {
-
- public void knockKnock(String aString);
- public void add(int anInt);
- public void initializeCount();
- public int getCount(ServiceReference aServiceReference);
- public int getLocalCount();
- public String getDateTime(ServiceReference aServiceReference);
- public boolean createServiceReferenceForSelf();
-
-}
diff --git a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java b/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java
deleted file mode 100644
index 45fc68308b..0000000000
--- a/branches/sca-java-0.99/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationsService.class)
-@Scope("CONVERSATION")
-
-public class ConversationsServiceImpl implements ConversationsService {
-
- @Context
- protected ComponentContext context;
-
- @Callback
- protected ConversationsCallback callback;
- private int count=0;
-
- public void knockKnock(String aString) {
-
- try
- {
- count++;
- //System.out.println("ConversationsServiceImpl message received: " + aString);
- callback.callBackMessage("Who's There " + count);
- callback.callBackIncrement("Add one please");
- //System.out.println("ConversationsServiceImpl responses sent");
- return;
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
- }
-
- }
-
- public int getCount(ServiceReference aServiceReference)
- {
-
- //
- // Invoke a method on the service reference and return back the result.
- //
-
- int count=0;
- try
- {
- count = ((ConversationsClient) aServiceReference).count();
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
- }
- return count;
-
- }
-
- public int getLocalCount()
- {
-
- //
- // Return my localc instance count. This is used for test4.
- //
-
- return count;
-
- }
-
- public String getDateTime(ServiceReference aServiceReference)
- {
-
- //
- // Invoke a method on the service reference and return back the result.
- //
-
- String dateTime;
- dateTime = ((ConversationsClient2) aServiceReference).getDateTime();
- return dateTime;
-
- }
-
- public void add(int anInt) {
-
- count +=anInt;
-
- }
-
- public void initializeCount() {
-
- count =0;
-
- }
-
- public boolean createServiceReferenceForSelf() {
-
- // This is done here because we need to test getting a ServiceReference
- // from a component that implements a single interface. The client in this test
- // impliments 2 interfaces to test the variant of this that takes interface name as an argumnet.
-
- boolean aBoolean = false;
-
- ServiceReference myServiceReference = null;
-
- try
- {
- myServiceReference = context.createSelfReference(ConversationsService.class);
- System.out.println("Laa: Created Service Reference for Session:" + myServiceReference);
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
- }
-
-
- if (myServiceReference != null)
- {
- aBoolean = true;
- System.out.println("Laa: Service Reference is not null");
- }
-
- return aBoolean;
- }
-
-
-}
-