svn commit: r507120 - in /incubator/tuscany/java: sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ spec/sca-api-r1.0/src/main/java/org/osoa/sca/ spec/sca-api-r1.0/src/test/java/sample/client/

[jb...@apache.org]

Author: jboynes
Date: Tue Feb 13 09:55:34 2007
New Revision: 507120

URL: http://svn.apache.org/viewvc?view=rev&rev=507120
Log:
update spec API for proposal for adding getCallback and getCallbackReference to RequestContext

Modified:
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ManagedRequestContext.java
    incubator/tuscany/java/spec/sca-api-r1.0/src/main/java/org/osoa/sca/RequestContext.java
    incubator/tuscany/java/spec/sca-api-r1.0/src/test/java/sample/client/BasicClient.java

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ManagedRequestContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ManagedRequestContext.java?view=diff&rev=507120&r1=507119&r2=507120
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ManagedRequestContext.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ManagedRequestContext.java Tue Feb 13 09:55:34 2007
@@ -22,6 +22,7 @@
 
 import org.osoa.sca.RequestContext;
 import org.osoa.sca.ServiceReference;
+import org.osoa.sca.CallableReference;
 
 import org.apache.tuscany.spi.component.WorkContext;
 
@@ -43,7 +44,15 @@
         return workContext.getCurrentServiceName();
     }
 
-    public ServiceReference getServiceReference() {
+    public <B> ServiceReference<B> getServiceReference() {
+        throw new UnsupportedOperationException();
+    }
+
+    public <CB> CB getCallback() {
+        throw new UnsupportedOperationException();
+    }
+
+    public <CB> CallableReference<CB> getCallbackReference() {
         throw new UnsupportedOperationException();
     }
 }

Modified: incubator/tuscany/java/spec/sca-api-r1.0/src/main/java/org/osoa/sca/RequestContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sca-api-r1.0/src/main/java/org/osoa/sca/RequestContext.java?view=diff&rev=507120&r1=507119&r2=507120
==============================================================================
--- incubator/tuscany/java/spec/sca-api-r1.0/src/main/java/org/osoa/sca/RequestContext.java (original)
+++ incubator/tuscany/java/spec/sca-api-r1.0/src/main/java/org/osoa/sca/RequestContext.java Tue Feb 13 09:55:34 2007
@@ -41,9 +41,23 @@
     String getServiceName();
 
     /**
-     * Returns a CallableReference to the service or callback that was invoked.
+     * Returns a ServiceReference for the service that was invoked by the caller.
      *
-     * @return a CallableReference to the service or callback that was invoked
+     * @return a ServiceReference for the service that was invoked by the caller
      */
-    <B, R extends CallableReference<B>> R getServiceReference();
+    <B> ServiceReference<B> getServiceReference();
+
+    /**
+     * Returns a type-safe reference to the callback provided by the caller.
+     *
+     * @return a type-safe reference to the callback provided by the caller
+     */
+    <CB> CB getCallback();
+
+    /**
+     * Returns a CallbackReference to the callback provided by the caller.
+     *
+     * @return a CallbackReference to the callback provided by the caller
+     */
+    <CB> CallableReference<CB> getCallbackReference();
 }

Modified: incubator/tuscany/java/spec/sca-api-r1.0/src/test/java/sample/client/BasicClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sca-api-r1.0/src/test/java/sample/client/BasicClient.java?view=diff&rev=507120&r1=507119&r2=507120
==============================================================================
--- incubator/tuscany/java/spec/sca-api-r1.0/src/test/java/sample/client/BasicClient.java (original)
+++ incubator/tuscany/java/spec/sca-api-r1.0/src/test/java/sample/client/BasicClient.java Tue Feb 13 09:55:34 2007
@@ -3,6 +3,7 @@
 import org.osoa.sca.ComponentContext;
 import org.osoa.sca.ServiceReference;
 import org.osoa.sca.CallableReference;
+import org.osoa.sca.RequestContext;
 import sample.HelloService;
 import sample.HelloCallback;
 
@@ -11,6 +12,7 @@
  */
 public class BasicClient {
     private ComponentContext context;
+    private RequestContext request;
 
     public void useComponentDirectly() {
         HelloService helloService = context.getService(HelloService.class, "helloService");
@@ -41,5 +43,11 @@
     public void castCallback() {
         HelloCallback callback = null;
         CallableReference<HelloCallback> cb = context.cast(callback);
+    }
+
+    public void getCallback() {
+        ServiceReference<HelloService> sr = request.getServiceReference();
+        CallableReference<HelloCallback> cb = request.getCallbackReference();
+        HelloCallback callback = request.getCallback();
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org