You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/12/05 01:48:35 UTC
svn commit: r723537 [2/4] - in /tuscany/java/sca/itest: ./ callback-api/
callback-api/src/main/java/org/apache/tuscany/sca/test/
callback-api/src/test/java/org/apache/tuscany/sca/test/ callback-basic/
callback-basic/src/main/java/org/apache/tuscany/sca...
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java Thu Dec 4 16:48:31 2008
@@ -26,7 +26,7 @@
*/
@Conversational
public interface DService {
-
+
/**
* Returns the state for this service.
*
@@ -40,7 +40,7 @@
* @param aState The state for this service
*/
void setState(String aState);
-
+
@EndsConversation
void endConversationViaAnnotatedMethod();
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java Thu Dec 4 16:48:31 2008
@@ -20,7 +20,6 @@
import org.osoa.sca.annotations.Remotable;
-
/**
* The callback interface used when testing conversational callbacks
*
@@ -28,19 +27,19 @@
*/
@Remotable
public interface NonConversationalCallback {
-
+
public void init();
-
+
public void destroy();
-
+
public void initializeCount(int count);
-
+
public void incrementCount();
-
+
public int retrieveCount();
-
- public void businessException() throws Exception;
-
+
+ public void businessException() throws Exception;
+
public String endConversation();
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java Thu Dec 4 16:48:31 2008
@@ -18,9 +18,6 @@
*/
package org.apache.tuscany.sca.itest.conversational.impl;
-import java.lang.reflect.Proxy;
-import org.apache.tuscany.sca.core.invocation.JDKInvocationHandler;
-
import org.apache.tuscany.sca.itest.conversational.AService;
import org.apache.tuscany.sca.itest.conversational.BService;
import org.apache.tuscany.sca.itest.conversational.Constants;
@@ -40,12 +37,12 @@
* The state
*/
private String state = Constants.A_INITIAL_VALUE;
-
+
/**
* The reference to the other service
*/
private BService b;
-
+
/**
* Constructor
*
@@ -58,12 +55,12 @@
* Inject the reference to the other service
* @param aB The other service.
*/
- @Reference(name="b")
+ @Reference(name = "b")
public void setB(BService aB) {
System.out.println("---> Setting reference to B on " + this + " to " + aB);
this.b = aB;
}
-
+
/**
* Returns the state for this service.
*
@@ -99,7 +96,7 @@
public void setStateOnB(String aState) {
b.setState(aState);
}
-
+
/**
* Sets the conversation ID for this service
* @param id The Conversation ID
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java Thu Dec 4 16:48:31 2008
@@ -39,10 +39,10 @@
public class AlphaImpl implements Alpha {
@Reference
public Beta beta;
-
+
@Context
protected ComponentContext componentContext;
-
+
public void run(int param) {
CallableReference<Gamma> gammaRef = null;
boolean testPassed = true;
@@ -61,8 +61,7 @@
} finally {
TestResult.updateCompleted();
if (gammaRef != null) {
- TestResult.results.put(gammaRef.getConversation()
- .getConversationID(), testPassed);
+ TestResult.results.put(gammaRef.getConversation().getConversationID(), testPassed);
gammaRef.getService().stop();
}
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java Thu Dec 4 16:48:31 2008
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.sca.itest.conversational.impl;
-
import org.apache.tuscany.sca.itest.conversational.BService;
import org.apache.tuscany.sca.itest.conversational.Constants;
import org.osoa.sca.annotations.ConversationID;
@@ -43,7 +42,7 @@
public BServiceImpl() {
System.out.println("---> BServiceImpl constructor for " + this);
}
-
+
/**
* Returns the state for this service.
*
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java Thu Dec 4 16:48:31 2008
@@ -42,8 +42,7 @@
public Gamma gamma;
public CallableReference<Gamma> getRef(int param) {
- ServiceReference<Gamma> gammaRef = componentContext
- .getServiceReference(Gamma.class, "gamma");
+ ServiceReference<Gamma> gammaRef = componentContext.getServiceReference(Gamma.class, "gamma");
Gamma g = gammaRef.getService();
g.start(param);
return gammaRef;
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java Thu Dec 4 16:48:31 2008
@@ -47,7 +47,6 @@
dServiceRef.getService().setState(aState);
}
-
/*
* When the coversationId is set manually the client may access the
* conversation id that will be used by the reference using
@@ -56,15 +55,15 @@
public Object getConversationID() {
return dServiceRef.getConversationID();
}
-
+
/*
* Whether the conversation ID is chosen by the client or is generated by
* the system, the client may access the conversation ID by calling
* Conversation.getConversationID().
- */
+ */
public Object getConversationObjectConversationId() {
// TODO Auto-generated method stub
- if (dServiceRef.getConversation() != null){
+ if (dServiceRef.getConversation() != null) {
return dServiceRef.getConversation().getConversationID();
} else {
return null;
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java Thu Dec 4 16:48:31 2008
@@ -26,16 +26,16 @@
@Service(ConversationalService.class)
@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="1 seconds")
+@ConversationAttributes(maxAge = "1 seconds")
public class ConversationAgeComponentImpl implements ConversationalService {
private int count;
-
- public void businessException() throws Exception {
+
+ public void businessException() throws Exception {
+ }
+
+ public void businessExceptionCallback() throws Exception {
}
-
- public void businessExceptionCallback() throws Exception {
- }
public void destroy() {
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java Thu Dec 4 16:48:31 2008
@@ -32,14 +32,14 @@
public String cid;
private String setterCid;
-
+
public String getCIDField() {
return cid;
}
+
public String getCIDSetter() {
return setterCid;
}
-
@ConversationID
public void setCID(String cid) {
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java Thu Dec 4 16:48:31 2008
@@ -26,17 +26,17 @@
@Service(ConversationalService.class)
@Scope("CONVERSATION")
-@ConversationAttributes(maxIdleTime="1 seconds")
+@ConversationAttributes(maxIdleTime = "1 seconds")
public class ConversationMaxIdleComponentImpl implements ConversationalService {
private int count;
- public void businessException() throws Exception {
+ public void businessException() throws Exception {
}
-
- public void businessExceptionCallback() throws Exception {
- }
-
+
+ public void businessExceptionCallback() throws Exception {
+ }
+
public void destroy() {
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java Thu Dec 4 16:48:31 2008
@@ -39,280 +39,284 @@
* @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
*/
-@Service(interfaces={ConversationalClient.class})
+@Service(interfaces = {ConversationalClient.class})
@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
- maxIdleTime="5 minutes",
- singlePrincipal=false)
+@ConversationAttributes(maxAge = "10 minutes", maxIdleTime = "5 minutes", singlePrincipal = false)
public class ConversationalClientStatefulImpl implements ConversationalClient, ConversationalCallback {
-
+
@Context
protected ComponentContext componentContext;
-
- @Reference
+
+ @Reference
protected ConversationalService conversationalService;
-
- @Reference
+
+ @Reference
protected ConversationalService conversationalService2;
-
+
@Reference
protected ConversationalReferenceClient conversationalReferenceClient;
-
+
private int clientCount = 0;
- private int callbackCount = 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();
-
+ 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(){
+ 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(){
+ }
+
+ public int runConversationFromServiceReference() {
calls.append("runConversationFromServiceReference,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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(){
+ }
+
+ public int runConversationWithUserDefinedConversationId() {
calls.append("runConversationWithUserDefinedConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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(){
+ }
+
+ public String runConversationCheckUserDefinedConversationId() {
calls.append("runConversationCheckUserDefinedConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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") ) {
+
+ if (clientConversationId.equals("MyConversation2") && serverConversationId.equals("MyConversation2")) {
return clientConversationId;
} else {
- return "client = " + clientConversationId +
- "server = " + serverConversationId;
- }
-
- }
- public int runConversationCheckingScope(){
+ 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;
+ }
+
+ public int runConversationWithCallback() {
+ calls.append("runConversationWithCallback,");
+ callbackCount = 2;
conversationalService.initializeCountCallback(1);
conversationalService.incrementCountCallback();
clientCount = conversationalService.retrieveCountCallback();
conversationalService.endConversationCallback();
-
+
return clientCount;
- }
- public int runConversationHavingPassedReference(){
+ }
+
+ public int runConversationHavingPassedReference() {
calls.append("runConversationHavingPassedReference,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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,");
+
+ public String runConversationBusinessException() {
+ calls.append("runConversationbusinessException,");
try {
conversationalService.initializeCount(1);
conversationalService.businessException();
clientCount = conversationalService.retrieveCount();
conversationalService.endConversation();
- } catch(Exception ex) {
+ } catch (Exception ex) {
return ex.getMessage();
}
-
+
return "No Exception Returned";
}
-
- public String runConversationBusinessExceptionCallback(){
+
+ public String runConversationBusinessExceptionCallback() {
calls.append("runConversationbusinessExceptionCallback,");
try {
conversationalService.initializeCountCallback(1);
conversationalService.businessExceptionCallback();
clientCount = conversationalService.retrieveCountCallback();
conversationalService.endConversationCallback();
- } catch(Exception ex) {
+ } catch (Exception ex) {
return ex.getMessage();
}
-
+
return "No Exception Returned";
- }
-
- public int runConversationCallingEndedConversation(){
+ }
+
+ public int runConversationCallingEndedConversation() {
calls.append("runConversationCallingEndedConversation,");
conversationalService.initializeCount(1);
conversationalService.endConversation();
return conversationalService.retrieveCount();
- }
-
- public int runConversationCallingEndedConversationCallback(){
+ }
+
+ public int runConversationCallingEndedConversationCallback() {
calls.append("runConversationCallingEndedConversationCallback,");
conversationalService.initializeCountCallback(1);
conversationalService.endConversationCallback();
return conversationalService.retrieveCountCallback();
- }
-
- public String runConversationCallingEndedConversationCheckConversationId(){
+ }
+
+ public String runConversationCallingEndedConversationCheckConversationId() {
calls.append("runConversationCallingEndedConversationCheckConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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 ) {
+
+ if (serviceReference.getConversation() == null) {
return null;
} else {
return serviceReference.getConversation().getConversationID().toString();
}
- }
-
- public String runConversationCallingEndedConversationCallbackCheckConversationId(){
+ }
+
+ public String runConversationCallingEndedConversationCallbackCheckConversationId() {
calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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 ) {
+
+ if (serviceReference.getConversation() == null) {
return null;
} else {
return serviceReference.getConversation().getConversationID().toString();
}
- }
-
- public int runConversationAgeTimeout(){
+ }
+
+ public int runConversationAgeTimeout() {
calls.append("runConversationAgeTimeout,");
// done in other testing
return clientCount;
}
- public int runConversationIdleTimeout(){
+
+ public int runConversationIdleTimeout() {
calls.append("runConversationIdleTimeout,");
// done in other testing
return clientCount;
}
- public int runConversationPrincipleError(){
+
+ public int runConversationPrincipleError() {
calls.append("runConversationPrincipleError,");
// TODO - when policy framework is done
return clientCount;
}
-
-
+
// From ConversationalCallback
@Init
- public void init(){
+ public void init() {
calls.append("init,");
}
-
+
@Destroy
- public void destroy(){
- calls.append("destroy,");
+ public void destroy() {
+ calls.append("destroy,");
}
-
- public void initializeCount(int count){
+
+ public void initializeCount(int count) {
calls.append("initializeCount,");
callbackCount += count;
}
-
- public void incrementCount(){
+
+ public void incrementCount() {
calls.append("incrementCount,");
callbackCount++;
}
-
- public int retrieveCount(){
+
+ public int retrieveCount() {
calls.append("retrieveCount,");
- return callbackCount;
+ return callbackCount;
}
-
+
public void businessException() throws Exception {
throw new Exception("Business Exception");
- }
-
- public String endConversation(){
+ }
+
+ public String endConversation() {
calls.append("endConversation,");
callbackCount = 0;
return null;
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java Thu Dec 4 16:48:31 2008
@@ -39,270 +39,277 @@
* @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
*/
-@Service(interfaces={ConversationalClient.class})
+@Service(interfaces = {ConversationalClient.class})
@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
- maxIdleTime="5 minutes",
- singlePrincipal=false)
-public class ConversationalClientStatefulNonConversationalCallbackImpl implements ConversationalClient, NonConversationalCallback {
-
+@ConversationAttributes(maxAge = "10 minutes", maxIdleTime = "5 minutes", singlePrincipal = false)
+public class ConversationalClientStatefulNonConversationalCallbackImpl implements ConversationalClient,
+ NonConversationalCallback {
+
@Context
protected ComponentContext componentContext;
-
- @Reference
+
+ @Reference
protected ConversationalService conversationalService;
-
- @Reference
+
+ @Reference
protected ConversationalService conversationalService2;
-
+
@Reference
protected ConversationalReferenceClient conversationalReferenceClient;
-
+
private int clientCount = 0;
- private int callbackCount = 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();
-
+ 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(){
+ 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(){
+ }
+
+ public int runConversationFromServiceReference() {
calls.append("runConversationFromServiceReference,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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(){
+ }
+
+ public int runConversationWithUserDefinedConversationId() {
calls.append("runConversationWithUserDefinedConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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(){
+ }
+
+ public String runConversationCheckUserDefinedConversationId() {
calls.append("runConversationCheckUserDefinedConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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(){
+
+ }
+
+ 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;
+ }
+
+ public int runConversationWithCallback() {
+ calls.append("runConversationWithCallback,");
+ callbackCount = 2;
conversationalService.initializeCountCallback(1);
conversationalService.incrementCountCallback();
clientCount = conversationalService.retrieveCountCallback();
conversationalService.endConversationCallback();
-
+
return clientCount;
- }
- public int runConversationHavingPassedReference(){
+ }
+
+ public int runConversationHavingPassedReference() {
calls.append("runConversationHavingPassedReference,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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,");
+
+ public String runConversationBusinessException() {
+ calls.append("runConversationbusinessException,");
try {
conversationalService.initializeCount(1);
conversationalService.businessException();
clientCount = conversationalService.retrieveCount();
conversationalService.endConversation();
- } catch(Exception ex) {
+ } catch (Exception ex) {
return ex.getMessage();
}
-
+
return "No Exception Returned";
}
-
- public String runConversationBusinessExceptionCallback(){
+
+ public String runConversationBusinessExceptionCallback() {
calls.append("runConversationbusinessExceptionCallback,");
try {
conversationalService.initializeCountCallback(1);
conversationalService.businessExceptionCallback();
clientCount = conversationalService.retrieveCountCallback();
conversationalService.endConversationCallback();
- } catch(Exception ex) {
+ } catch (Exception ex) {
return ex.getMessage();
}
-
+
return "No Exception Returned";
- }
-
- public String runConversationCallingEndedConversationCheckConversationId(){
+ }
+
+ public String runConversationCallingEndedConversationCheckConversationId() {
calls.append("runConversationCallingEndedConversationCheckConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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 ) {
+
+ if (serviceReference.getConversation() == null) {
return null;
} else {
return serviceReference.getConversation().getConversationID().toString();
}
- }
-
- public String runConversationCallingEndedConversationCallbackCheckConversationId(){
+ }
+
+ public String runConversationCallingEndedConversationCallbackCheckConversationId() {
calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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 ) {
+
+ if (serviceReference.getConversation() == null) {
return null;
} else {
return serviceReference.getConversation().getConversationID().toString();
}
- }
-
- public int runConversationCallingEndedConversation(){
+ }
+
+ public int runConversationCallingEndedConversation() {
calls.append("runConversationCallingEndedConversation,");
conversationalService.initializeCount(1);
conversationalService.endConversation();
return conversationalService.retrieveCount();
- }
-
- public int runConversationCallingEndedConversationCallback(){
+ }
+
+ public int runConversationCallingEndedConversationCallback() {
calls.append("runConversationCallingEndedConversationCallback,");
conversationalService.initializeCountCallback(1);
conversationalService.endConversationCallback();
return conversationalService.retrieveCountCallback();
- }
-
- public int runConversationAgeTimeout(){
+ }
+
+ public int runConversationAgeTimeout() {
calls.append("runConversationAgeTimeout,");
// done in other testing
return clientCount;
}
- public int runConversationIdleTimeout(){
+
+ public int runConversationIdleTimeout() {
calls.append("runConversationIdleTimeout,");
// done in other testing
return clientCount;
}
- public int runConversationPrincipleError(){
+
+ public int runConversationPrincipleError() {
calls.append("runConversationPrincipleError,");
// TODO - when policy framework is done
return clientCount;
}
-
-
+
// From ConversationalCallback
@Init
- public void init(){
+ public void init() {
calls.append("init,");
}
-
+
@Destroy
- public void destroy(){
- calls.append("destroy,");
+ public void destroy() {
+ calls.append("destroy,");
}
-
- public void initializeCount(int count){
+
+ public void initializeCount(int count) {
calls.append("initializeCount,");
callbackCount += count;
}
-
- public void incrementCount(){
+
+ public void incrementCount() {
calls.append("incrementCount,");
callbackCount++;
}
-
- public int retrieveCount(){
+
+ public int retrieveCount() {
calls.append("retrieveCount,");
- return callbackCount;
+ return callbackCount;
}
-
+
public void businessException() throws Exception {
throw new Exception("Business Exception");
- }
-
- public String endConversation(){
+ }
+
+ public String endConversation() {
calls.append("endConversation,");
return null;
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java Thu Dec 4 16:48:31 2008
@@ -37,278 +37,283 @@
* @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
*/
-@Service(interfaces={ConversationalClient.class})
+@Service(interfaces = {ConversationalClient.class})
public class ConversationalClientStatelessImpl implements ConversationalClient, ConversationalCallback {
-
+
@Context
protected ComponentContext componentContext;
-
- @Reference
+
+ @Reference
protected ConversationalService conversationalService;
-
- @Reference
+
+ @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();
-
+ public static StringBuffer calls = new StringBuffer();
+
// From ConversationalClient
- public int runConversationFromInjectedReference(){
+ public int runConversationFromInjectedReference() {
calls.append("runConversationFromInjectedReference,");
conversationalService.initializeCount(1);
conversationalService.incrementCount();
clientCount = conversationalService.retrieveCount();
conversationalService.endConversation();
-
+
return clientCount;
}
- public int runConversationFromInjectedReference2(){
- calls.append("runConversationFromInjectedReference2,");
+
+ 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(){
+
+ public int runConversationFromServiceReference() {
calls.append("runConversationFromServiceReference,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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(){
+ }
+
+ public int runConversationWithUserDefinedConversationId() {
calls.append("runConversationWithUserDefinedConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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(){
+ }
+
+ public String runConversationCheckUserDefinedConversationId() {
calls.append("runConversationCheckUserDefinedConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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") ) {
+
+ if (clientConversationId.equals("MyConversation2") && serverConfersationId.equals("MyConversation2")) {
return clientConversationId;
} else {
- return "client = " + clientConversationId +
- "server = " + serverConfersationId;
- }
- }
- public int runConversationCheckingScope(){
+ 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(){
+
+ public int runConversationWithCallback() {
calls.append("runConversationWithCallback,");
conversationalService.initializeCountCallback(1);
conversationalService.incrementCountCallback();
clientCount = conversationalService.retrieveCountCallback();
conversationalService.endConversationCallback();
-
+
return clientCount;
- }
-
- public int runConversationHavingPassedReference(){
+ }
+
+ public int runConversationHavingPassedReference() {
calls.append("runConversationHavingPassedReference,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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 {
+ }
+
+ public String runConversationBusinessException() {
+ calls.append("runConversationbusinessException,");
+ try {
conversationalService.initializeCount(1);
conversationalService.businessException();
clientCount = conversationalService.retrieveCount();
conversationalService.endConversation();
- } catch(Exception ex) {
- return ex.getMessage();
- }
-
+ } catch (Exception ex) {
+ return ex.getMessage();
+ }
+
return "No Exception Returned";
}
-
- public String runConversationBusinessExceptionCallback(){
+
+ public String runConversationBusinessExceptionCallback() {
calls.append("runConversationbusinessExceptionCallback,");
try {
conversationalService.initializeCountCallback(1);
conversationalService.businessExceptionCallback();
clientCount = conversationalService.retrieveCountCallback();
conversationalService.endConversationCallback();
- } catch(Exception ex) {
+ } catch (Exception ex) {
return ex.getMessage();
}
-
+
return "No Exception Returned";
- }
-
- public int runConversationCallingEndedConversation(){
+ }
+
+ public int runConversationCallingEndedConversation() {
calls.append("runConversationCallingEndedConversation,");
conversationalService.initializeCount(1);
conversationalService.endConversation();
return conversationalService.retrieveCount();
- }
-
- public int runConversationCallingEndedConversationCallback(){
+ }
+
+ public int runConversationCallingEndedConversationCallback() {
calls.append("runConversationCallingEndedConversationCallback,");
conversationalService.initializeCountCallback(1);
conversationalService.endConversationCallback();
return conversationalService.retrieveCountCallback();
- }
-
- public String runConversationCallingEndedConversationCheckConversationId(){
+ }
+
+ public String runConversationCallingEndedConversationCheckConversationId() {
calls.append("runConversationCallingEndedConversationCheckConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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 ) {
+
+ if (serviceReference.getConversation() == null) {
return null;
} else {
return serviceReference.getConversation().getConversationID().toString();
}
- }
-
- public String runConversationCallingEndedConversationCallbackCheckConversationId(){
+ }
+
+ public String runConversationCallingEndedConversationCallbackCheckConversationId() {
calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ 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 ) {
+
+ if (serviceReference.getConversation() == null) {
return null;
} else {
return serviceReference.getConversation().getConversationID().toString();
- }
- }
-
- public int runConversationAgeTimeout(){
+ }
+ }
+
+ public int runConversationAgeTimeout() {
calls.append("runConversationAgeTimeout,");
// done in other testing
return clientCount;
}
- public int runConversationIdleTimeout(){
+
+ public int runConversationIdleTimeout() {
calls.append("runConversationIdleTimeout,");
// done in other testing
return clientCount;
}
- public int runConversationPrincipleError(){
+
+ public int runConversationPrincipleError() {
calls.append("runConversationPrincipleError,");
// TODO - when policy framework is done
return clientCount;
}
-
-
+
// From ConversationalCallback
@Init
- public void init(){
+ public void init() {
calls.append("init,");
}
-
+
@Destroy
- public void destroy(){
+ public void destroy() {
calls.append("destroy,");
-
+
}
-
- public void initializeCount(int count){
+
+ public void initializeCount(int count) {
calls.append("initializeCount,");
callbackCount = 0;
}
-
- public void incrementCount(){
+
+ public void incrementCount() {
calls.append("incrementCount,");
callbackCount++;
}
-
- public int retrieveCount(){
+
+ public int retrieveCount() {
calls.append("retrieveCount,");
- return callbackCount;
+ return callbackCount;
}
-
+
public void businessException() throws Exception {
throw new Exception("Business Exception");
- }
-
- public String endConversation(){
+ }
+
+ public String endConversation() {
calls.append("endConversation,");
callbackCount = 0;
return null;
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java Thu Dec 4 16:48:31 2008
@@ -30,14 +30,13 @@
* @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){
+@Service(interfaces = {ConversationalReferenceClient.class})
+public class ConversationalReferenceClientImpl implements ConversationalReferenceClient {
+
+ public void incrementCount(CallableReference<ConversationalService> conversationalService) {
ConversationalService callableReference = conversationalService.getService();
-
- callableReference.incrementCount();
- }
+ callableReference.incrementCount();
+ }
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java Thu Dec 4 16:48:31 2008
@@ -29,7 +29,6 @@
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-
/**
* The service used when testing stateful conversations
*
@@ -38,86 +37,86 @@
@Service(ConversationalService.class)
@Scope("REQUEST")
public class ConversationalServiceRequestImpl implements ConversationalService {
-
+
@ConversationID
protected String conversationId;
-
+
@Callback
- protected ConversationalCallback conversationalCallback;
-
+ 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(){
+ public void init() {
calls.append("init,");
}
-
+
@Destroy
- public void destroy(){
+ public void destroy() {
calls.append("destroy,");
}
-
- public void initializeCount(int count){
+
+ public void initializeCount(int count) {
calls.append("initializeCount,");
- Integer conversationalCount = new Integer(count);
+ Integer conversationalCount = new Integer(count);
conversationalState.put(conversationId, conversationalCount);
}
-
- public void incrementCount(){
+
+ public void incrementCount() {
calls.append("incrementCount,");
Integer conversationalCount = conversationalState.get(conversationId);
conversationalCount++;
conversationalState.put(conversationId, conversationalCount);
}
-
- public int retrieveCount(){
+
+ public int retrieveCount() {
calls.append("retrieveCount,");
Integer count = conversationalState.get(conversationId);
- if (count != null){
+ if (count != null) {
return count.intValue();
} else {
return -999;
}
}
-
+
public void businessException() throws Exception {
throw new Exception("Business Exception");
- }
-
- public void initializeCountCallback(int count){
+ }
+
+ public void initializeCountCallback(int count) {
calls.append("initializeCountCallback,");
initializeCount(count);
conversationalCallback.initializeCount(count);
}
-
- public void incrementCountCallback(){
+
+ public void incrementCountCallback() {
calls.append("incrementCountCallback,");
incrementCount();
conversationalCallback.incrementCount();
}
-
- public int retrieveCountCallback(){
+
+ public int retrieveCountCallback() {
calls.append("retrieveCountCallback,");
return conversationalCallback.retrieveCount();
}
-
+
public void businessExceptionCallback() throws Exception {
- calls.append("businessExceptionCallback,");
+ calls.append("businessExceptionCallback,");
conversationalCallback.businessException();
}
-
- public String endConversation(){
+
+ public String endConversation() {
calls.append("endConversation,");
conversationalState.remove(conversationId);
return conversationId;
}
-
- public String endConversationCallback(){
- calls.append("endConversationCallback,");
+
+ public String endConversationCallback() {
+ calls.append("endConversationCallback,");
return conversationalCallback.endConversation();
- }
+ }
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java Thu Dec 4 16:48:31 2008
@@ -28,7 +28,6 @@
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-
/**
* The service used when testing stateful conversations
*
@@ -36,82 +35,80 @@
*/
@Service(ConversationalService.class)
@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
- maxIdleTime="5 minutes",
- singlePrincipal=false)
+@ConversationAttributes(maxAge = "10 minutes", maxIdleTime = "5 minutes", singlePrincipal = false)
public class ConversationalServiceStatefulImpl implements ConversationalService {
@ConversationID
protected String conversationId;
-
+
@Callback
- protected ConversationalCallback conversationalCallback;
-
+ 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(){
+ public void init() {
calls.append("init,");
}
-
+
@Destroy
- public void destroy(){
+ public void destroy() {
calls.append("destroy,");
}
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
+
+ public void initializeCount(int count) {
+ calls.append("initializeCount,");
this.count = count;
}
-
- public void incrementCount(){
- calls.append("incrementCount,");
+
+ public void incrementCount() {
+ calls.append("incrementCount,");
count++;
}
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
+
+ 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,");
+ }
+
+ public void initializeCountCallback(int count) {
+ calls.append("initializeCountCallback,");
this.count = count;
conversationalCallback.initializeCount(count);
}
-
- public void incrementCountCallback(){
- calls.append("incrementCountCallback,");
+
+ public void incrementCountCallback() {
+ calls.append("incrementCountCallback,");
count++;
conversationalCallback.incrementCount();
}
-
- public int retrieveCountCallback(){
- calls.append("retrieveCountCallback,");
+
+ public int retrieveCountCallback() {
+ calls.append("retrieveCountCallback,");
return conversationalCallback.retrieveCount();
}
-
+
public void businessExceptionCallback() throws Exception {
- calls.append("businessExceptionCallback,");
+ calls.append("businessExceptionCallback,");
conversationalCallback.businessException();
- }
-
- public String endConversation(){
- calls.append("endConversation,");
+ }
+
+ public String endConversation() {
+ calls.append("endConversation,");
count = 0;
return conversationId;
}
-
- public String endConversationCallback(){
- calls.append("endConversationCallback,");
+
+ public String endConversationCallback() {
+ calls.append("endConversationCallback,");
return conversationalCallback.endConversation();
}
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java Thu Dec 4 16:48:31 2008
@@ -28,7 +28,6 @@
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-
/**
* The service used when testing stateful conversations
*
@@ -36,82 +35,81 @@
*/
@Service(ConversationalServiceNonConversationalCallback.class)
@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
- maxIdleTime="5 minutes",
- singlePrincipal=false)
-public class ConversationalServiceStatefulNonConversationalCallbackImpl implements ConversationalServiceNonConversationalCallback {
+@ConversationAttributes(maxAge = "10 minutes", maxIdleTime = "5 minutes", singlePrincipal = false)
+public class ConversationalServiceStatefulNonConversationalCallbackImpl implements
+ ConversationalServiceNonConversationalCallback {
@ConversationID
protected String conversationId;
-
+
@Callback
- protected NonConversationalCallback nonConversationalCallback;
-
+ 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(){
+ public void init() {
calls.append("init,");
}
-
+
@Destroy
- public void destroy(){
+ public void destroy() {
calls.append("destroy,");
}
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
+
+ public void initializeCount(int count) {
+ calls.append("initializeCount,");
this.count = count;
}
-
- public void incrementCount(){
- calls.append("incrementCount,");
+
+ public void incrementCount() {
+ calls.append("incrementCount,");
count++;
}
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
+
+ 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,");
+ }
+
+ public void initializeCountCallback(int count) {
+ calls.append("initializeCountCallback,");
this.count = count;
nonConversationalCallback.initializeCount(count);
}
-
- public void incrementCountCallback(){
- calls.append("incrementCountCallback,");
+
+ public void incrementCountCallback() {
+ calls.append("incrementCountCallback,");
count++;
nonConversationalCallback.incrementCount();
}
-
- public int retrieveCountCallback(){
- calls.append("retrieveCountCallback,");
+
+ public int retrieveCountCallback() {
+ calls.append("retrieveCountCallback,");
return nonConversationalCallback.retrieveCount();
}
-
+
public void businessExceptionCallback() throws Exception {
- calls.append("businessExceptionCallback,");
+ calls.append("businessExceptionCallback,");
nonConversationalCallback.businessException();
- }
-
- public String endConversation(){
- calls.append("endConversation,");
+ }
+
+ public String endConversation() {
+ calls.append("endConversation,");
count = 0;
return conversationId;
}
-
- public String endConversationCallback(){
- calls.append("endConversationCallback,");
+
+ public String endConversationCallback() {
+ calls.append("endConversationCallback,");
return nonConversationalCallback.endConversation();
}
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java Thu Dec 4 16:48:31 2008
@@ -29,7 +29,6 @@
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-
/**
* The service used when testing stateful conversations
*
@@ -38,86 +37,86 @@
@Service(ConversationalService.class)
@Scope("STATELESS")
public class ConversationalServiceStatelessImpl implements ConversationalService {
-
+
@ConversationID
protected String conversationId;
-
+
@Callback
- protected ConversationalCallback conversationalCallback;
-
+ 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(){
+ public void init() {
calls.append("init,");
}
-
+
@Destroy
- public void destroy(){
+ public void destroy() {
calls.append("destroy,");
}
-
- public void initializeCount(int count){
+
+ public void initializeCount(int count) {
calls.append("initializeCount,");
- Integer conversationalCount = new Integer(count);
+ Integer conversationalCount = new Integer(count);
conversationalState.put(conversationId, conversationalCount);
}
-
- public void incrementCount(){
+
+ public void incrementCount() {
calls.append("incrementCount,");
Integer conversationalCount = conversationalState.get(conversationId);
conversationalCount++;
conversationalState.put(conversationId, conversationalCount);
}
-
- public int retrieveCount(){
+
+ public int retrieveCount() {
calls.append("retrieveCount,");
Integer count = conversationalState.get(conversationId);
- if (count != null){
+ if (count != null) {
return count.intValue();
} else {
return -999;
}
}
-
+
public void businessException() throws Exception {
throw new Exception("Business Exception");
- }
-
- public void initializeCountCallback(int count){
+ }
+
+ public void initializeCountCallback(int count) {
calls.append("initializeCountCallback,");
initializeCount(count);
conversationalCallback.initializeCount(count);
}
-
- public void incrementCountCallback(){
+
+ public void incrementCountCallback() {
calls.append("incrementCountCallback,");
incrementCount();
conversationalCallback.incrementCount();
}
-
- public int retrieveCountCallback(){
+
+ public int retrieveCountCallback() {
calls.append("retrieveCountCallback,");
return conversationalCallback.retrieveCount();
}
-
+
public void businessExceptionCallback() throws Exception {
- calls.append("businessExceptionCallback,");
+ calls.append("businessExceptionCallback,");
conversationalCallback.businessException();
}
-
- public String endConversation(){
+
+ public String endConversation() {
calls.append("endConversation,");
conversationalState.remove(conversationId);
return conversationId;
}
-
- public String endConversationCallback(){
- calls.append("endConversationCallback,");
+
+ public String endConversationCallback() {
+ calls.append("endConversationCallback,");
return conversationalCallback.endConversation();
- }
+ }
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java Thu Dec 4 16:48:31 2008
@@ -33,10 +33,10 @@
protected String cid;
static Map<String, Integer> state = new HashMap<String, Integer>();
-
+
public void destroy() {
// TODO Auto-generated method stub
-
+
}
public String endConversation() {
@@ -47,25 +47,25 @@
public String endConversationCallback() {
// TODO Auto-generated method stub
return null;
-
+
}
public void incrementCount() {
- state.put(cid, Integer.valueOf(state.get(cid)+1));
+ 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) {
@@ -74,12 +74,12 @@
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);
@@ -89,5 +89,5 @@
// TODO Auto-generated method stub
return 0;
}
-
+
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java Thu Dec 4 16:48:31 2008
@@ -18,11 +18,8 @@
*/
package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.Constants;
import org.apache.tuscany.sca.itest.conversational.DService;
import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.EndsConversation;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
@@ -62,10 +59,10 @@
*/
@ConversationID
public void setConversationID(String id) {
- System.out.println ("Setting conversation ID at service = " + id );
+ System.out.println("Setting conversation ID at service = " + id);
}
-
+
public void endConversationViaAnnotatedMethod() {
- System.out.println ("Annotated Ends Conversation");
+ System.out.println("Annotated Ends Conversation");
}
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java Thu Dec 4 16:48:31 2008
@@ -37,7 +37,7 @@
public String conversationId;
private ArrayList<Record> list;
-
+
public void start(int param) {
list = new ArrayList<Record>();
fillList(param, conversationId);
@@ -54,7 +54,7 @@
public void stop() {
list = null;
}
-
+
private void fillList(int param, String cid) {
for (int i = 0; i < param; i++) {
Record record = new Record();
Modified: tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java (original)
+++ tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java Thu Dec 4 16:48:31 2008
@@ -19,8 +19,10 @@
package org.apache.tuscany.sca.itest.conversational;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -28,25 +30,25 @@
public class ConversationIdTestCase {
- private SCADomain domain;
+ private Node node;
@Before
public void setUp() throws Exception {
- domain = SCADomain.newInstance("conversationId.composite");
-
+ String location = ContributionLocationHelper.getContributionLocation("conversationId.composite");
+ node = NodeFactory.newInstance().createNode("conversationId.composite", new Contribution("c1", location));
+ node.start();
}
@After
public void tearDown() throws Exception {
- if (domain != null) {
- domain.close();
+ if (node != null) {
+ node.stop();
}
}
@Test
public void testConversationId() {
- ConversationIdService service =
- domain.getService(ConversationIdService.class, "ConversationIdComponent");
+ ConversationIdService service = node.getService(ConversationIdService.class, "ConversationIdComponent");
Assert.assertNotNull(service.getCIDField());
Assert.assertNotNull(service.getCIDSetter());
}