You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2009/09/14 00:38:02 UTC
svn commit: r814412 - in
/tuscany/branches/sca-java-1.x/samples/implementation-composite/src:
main/java/composite/SourceImpl.java main/java/composite/TargetImpl.java
main/resources/META-INF/sca-contribution.xml
test/java/composite/CompositeTestCase.java
Author: nash
Date: Sun Sep 13 22:38:01 2009
New Revision: 814412
URL: http://svn.apache.org/viewvc?rev=814412&view=rev
Log:
Copy r810812, r810816, r810830, r810833 and r810848 changes from 1.5.1 branch to 1.x branch
Modified:
tuscany/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/SourceImpl.java
tuscany/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/TargetImpl.java
tuscany/branches/sca-java-1.x/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
tuscany/branches/sca-java-1.x/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
Modified: tuscany/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/SourceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/SourceImpl.java?rev=814412&r1=814411&r2=814412&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/SourceImpl.java (original)
+++ tuscany/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/SourceImpl.java Sun Sep 13 22:38:01 2009
@@ -27,6 +27,7 @@
@Scope("COMPOSITE")
public class SourceImpl implements Source, SourceCallback {
+ public static int callbackCount = 0;
private Target targetReference;
private Target targetReference2;
@@ -49,6 +50,9 @@
}
public void receiveResult(String result) {
+ synchronized(this) {
+ callbackCount += 1;
+ }
System.out.println("Work thread " + Thread.currentThread());
System.out.println("Result: " + result);
}
Modified: tuscany/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/TargetImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/TargetImpl.java?rev=814412&r1=814411&r2=814412&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/TargetImpl.java (original)
+++ tuscany/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/TargetImpl.java Sun Sep 13 22:38:01 2009
@@ -18,7 +18,9 @@
*/
package composite;
+import org.osoa.sca.ComponentContext;
import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.Context;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
@@ -27,15 +29,16 @@
@Scope("COMPOSITE")
public class TargetImpl implements Target {
- private SourceCallback sourceCallback;
+ private ComponentContext ctx;
- @Callback
- public void setSourceCallback(SourceCallback sourceCallback) {
- this.sourceCallback = sourceCallback;
+ @Context
+ public void setContext(ComponentContext context) {
+ ctx = context;
}
public void someMethod(String arg) {
System.out.println("Target: " + arg);
+ SourceCallback sourceCallback = (SourceCallback)ctx.getRequestContext().getCallbackReference().getService();
sourceCallback.receiveResult(arg + " -> Target.someMethod");
}
}
Modified: tuscany/branches/sca-java-1.x/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml?rev=814412&r1=814411&r2=814412&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml Sun Sep 13 22:38:01 2009
@@ -19,7 +19,6 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
xmlns:sample="http://sample">
<deployable composite="sample:OuterComposite"/>
</contribution>
\ No newline at end of file
Modified: tuscany/branches/sca-java-1.x/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java?rev=814412&r1=814411&r2=814412&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java Sun Sep 13 22:38:01 2009
@@ -39,13 +39,12 @@
}
public void test() throws Exception {
- try {
- System.out.println("Main thread " + Thread.currentThread());
- source.clientMethod("Client.main");
- System.out.println("Sleeping ...");
- Thread.sleep(1000);
- } catch (Throwable t) {
- t.printStackTrace();
+ System.out.println("Main thread " + Thread.currentThread());
+ source.clientMethod("Client.main");
+ System.out.println("Sleeping ...");
+ Thread.sleep(1000);
+ if (SourceImpl.callbackCount != 2) {
+ throw new IllegalStateException("Expected callbacks not received");
}
}
}