svn commit: r654459 - in /incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src: main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/ test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/

[nash]

Author: nash
Date: Thu May  8 02:44:04 2008
New Revision: 654459

URL: http://svn.apache.org/viewvc?rev=654459&view=rev
Log:
Fix TUSCANY-2299

Modified:
    
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/AServiceImpl2.java
    
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java

Modified: 
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/AServiceImpl2.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/AServiceImpl2.java?rev=654459&r1=654458&r2=654459&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/AServiceImpl2.java
 (original)
+++ 
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/AServiceImpl2.java
 Thu May  8 02:44:04 2008
@@ -23,13 +23,18 @@
 import org.apache.tuscany.sca.vtest.javaapi.conversation.callback.BService;
 import 
org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.AServiceCallback;
 import org.junit.Assert;
+import org.osoa.sca.RequestContext;
 import org.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Context;
 import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Service;
 
 @Service(AService.class)
 public class AServiceImpl2 implements AService, AServiceCallback {
 
+    @Context
+    protected RequestContext rc;
+
     @Reference
     protected ServiceReference<BService> b;
 
@@ -40,12 +45,12 @@
     public void callBack(String someState) {
         System.out.println("A callback called with this state => " + 
someState);
         this.someState = someState;
-        Assert.assertSame(someKey, b.getCallbackID());
+        Assert.assertSame(someKey, rc.getServiceReference().getCallbackID());
     }  
 
     public void testCallback() {
 
-        b.setCallbackID("someKey");
+        b.setCallbackID(someKey);
         b.getService().testCallBack("Some string");
         int count = 4;
         while (someState == null && count > 0) {

Modified: 
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java?rev=654459&r1=654458&r2=654459&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
 Thu May  8 02:44:04 2008
@@ -227,7 +227,6 @@
      * received.
      */
     @Test
-    @Ignore("TUSCANY-2299")
     public void statelessCallback2() throws Exception {
         System.out.println("Setting up for stateless callback tests");
         domain = 
SCADomain.newInstance("callback-stateless-callbackid.composite");