You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by kw...@apache.org on 2008/04/23 20:09:07 UTC
svn commit: r650975 - in
/incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src:
main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/
main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/
test/java/org/apac...
Author: kwilliams
Date: Wed Apr 23 11:09:05 2008
New Revision: 650975
URL: http://svn.apache.org/viewvc?rev=650975&view=rev
Log:
Applying YKs patch for TUSCANY-2264
Modified:
incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
Modified: incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java?rev=650975&r1=650974&r2=650975&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java (original)
+++ incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java Wed Apr 23 11:09:05 2008
@@ -29,5 +29,7 @@
public boolean isJAASSubject();
public String getServiceName();
public String getCallbackResult();
+ public String getServiceReferenceName();
+ public String getCallbackServiceReferenceName();
}
Modified: incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java?rev=650975&r1=650974&r2=650975&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java (original)
+++ incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java Wed Apr 23 11:09:05 2008
@@ -21,6 +21,7 @@
public interface BCallback {
+ public String getCallbackName();
public void processResults(String result);
}
Modified: incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java?rev=650975&r1=650974&r2=650975&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java (original)
+++ incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java Wed Apr 23 11:09:05 2008
@@ -30,5 +30,6 @@
public String getName();
public void testCallback();
+ public String getServiceReferenceName();
}
Modified: incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java?rev=650975&r1=650974&r2=650975&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java (original)
+++ incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java Wed Apr 23 11:09:05 2008
@@ -24,6 +24,7 @@
import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.AComponent;
import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.BCallback;
import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.BComponent;
+import org.osoa.sca.CallableReference;
import org.osoa.sca.ComponentContext;
import org.osoa.sca.ServiceReference;
import org.osoa.sca.annotations.Context;
@@ -35,9 +36,10 @@
private static Object monitor = new Object();
private static String returnMessage = null;
+ private static CallableReference<BCallback> cbCR;
protected ComponentContext componentContext;
-
+
@Reference
protected BComponent bReference;
@@ -81,6 +83,20 @@
public void processResults(String result) {
returnMessage = result;
+ cbCR = componentContext.getRequestContext().getServiceReference();
+ }
+
+ public String getServiceReferenceName() {
+ CallableReference<AComponent> aCR = componentContext.getRequestContext().getServiceReference();
+ return aCR.getService().getName();
+ }
+
+ public String getCallbackServiceReferenceName() {
+ return cbCR.getService().getCallbackName();
+ }
+
+ public String getCallbackName() {
+ return "CallBackB";
}
}
Modified: incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java?rev=650975&r1=650974&r2=650975&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java (original)
+++ incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java Wed Apr 23 11:09:05 2008
@@ -53,8 +53,9 @@
Assert.assertEquals("ComponentACallBack", bCR.getCallbackID());
}
- public void testCallbackServiceReference() {
- // ServiceReference bSR = componentContext.getRequestContext().getServiceReference();
+ public String getServiceReferenceName() {
+ CallableReference<BComponent> bCR = componentContext.getRequestContext().getServiceReference();
+ return bCR.getService().getName();
}
}
Modified: incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java?rev=650975&r1=650974&r2=650975&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java (original)
+++ incubator/tuscany/java/sca/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java Wed Apr 23 11:09:05 2008
@@ -92,14 +92,17 @@
/**
* L863 <br>
- * getServiceReference() Returns the callable reference that represents the service or callback reference that the request was invoked on.
- * It is illegal for the service implementation to try to call the setCallback() on a returned service reference.
+ * getServiceReference() When invoked during the execution of a service operation,
+ * this API MUST return a CallableReference that represents the service. When invoked during the execution of a callback operation,
+ * this API MUST return a CallableReference that represents the callback service.
*
* @throws Exception
*/
@Test
public void testGetServiceReference() throws Exception {
-
+ Assert.assertEquals("ComponentA", a.getServiceReferenceName());
+ Assert.assertEquals("ComponentB", b.getServiceReferenceName());
+ Assert.assertEquals("CallBackB", a.getCallbackServiceReferenceName());
}
}