Author: slaws
Date: Thu Jul 19 15:41:55 2007
New Revision: 557801

URL: http://svn.apache.org/viewvc?view=rev&rev=557801
Log:
TUSCANY-1377
More steps on the way of getting stateless conversations to work - not there yet

Modified:
    
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
    
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java

Modified: 
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java?view=diff&rev=557801&r1=557800&r2=557801
==============================================================================
--- 
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
 (original)
+++ 
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
 Thu Jul 19 15:41:55 2007
@@ -74,10 +74,10 @@
            
            ConversationalService callableReference = 
serviceReference.getService();
            
-           conversationalService.initializeCount(1);
-           conversationalService.incrementCount();
-           int count = conversationalService.retrieveCount();
-           conversationalService.endConversation();
+           callableReference.initializeCount(1);
+           callableReference.incrementCount();
+           int count = callableReference.retrieveCount();
+           callableReference.endConversation();
            
         return clientCount;
     }

Modified: 
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java?view=diff&rev=557801&r1=557800&r2=557801
==============================================================================
--- 
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
 (original)
+++ 
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
 Thu Jul 19 15:41:55 2007
@@ -24,6 +24,7 @@
 import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
 import org.apache.tuscany.sca.itest.conversational.ConversationalService;
 import org.osoa.sca.ComponentContext;
+import org.osoa.sca.Conversation;
 import org.osoa.sca.ServiceReference;
 import org.osoa.sca.annotations.Callback;
 import org.osoa.sca.annotations.Context;
@@ -46,8 +47,8 @@
 @Service(ConversationalService.class)
 public class ConversationalServiceStatelessImpl implements 
ConversationalService {
     
-    @Context
-    protected ComponentContext componentContext;
+    @ConversationID
+    String conversationId;
     
     // @Callback - not working yet
     protected ConversationalCallback conversationalCallback; 
@@ -66,18 +67,15 @@
     
     public void initializeCount(int count){
         Integer conversationalCount = new Integer(count); 
-        String conversationId = getConversationId();
         conversationalState.put(conversationId, conversationalCount);
     }
     
     public void incrementCount(){
-        String conversationId = getConversationId();
         Integer conversationalCount = conversationalState.get(conversationId);
         conversationalCount++;
     }
     
     public int retrieveCount(){
-        String conversationId = getConversationId();
         return conversationalState.get(conversationId).intValue();
     }
     
@@ -96,17 +94,10 @@
     }
     
     public void endConversation(){
-        String conversationId = getConversationId();
         conversationalState.remove(conversationId);
     }
     
     public void endConversationCallback(){
         conversationalCallback.endConversation();
-    }
-    
-    private String getConversationId(){
-        ServiceReference<ConversationalService> serviceReference = 
componentContext.createSelfReference(ConversationalService.class);
-        return (String)serviceReference.getConversationID();
-
-    }
+    }   
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to