Author: slaws
Date: Fri Oct 15 16:25:02 2010
New Revision: 1022997
URL: http://svn.apache.org/viewvc?rev=1022997&view=rev
Log:
TUSCANY-3728 Rename the reference async interface and correct the signature of
the poll operation which is causing a bind failure in the JIRA.
Added:
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculateReferenceAsync.java
- copied, changed from r1022893,
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculateViaAsyncRef.java
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSync.java
- copied, changed from r1022893,
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorService.java
Removed:
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculateViaAsyncRef.java
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorService.java
Modified:
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorClient.java
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceProxyImpl.java
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSyncImpl.java
Copied:
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculateReferenceAsync.java
(from r1022893,
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculateViaAsyncRef.java)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculateReferenceAsync.java?p2=tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculateReferenceAsync.java&p1=tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculateViaAsyncRef.java&r1=1022893&r2=1022997&rev=1022997&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculateViaAsyncRef.java
(original)
+++
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculateReferenceAsync.java
Fri Oct 15 16:25:02 2010
@@ -22,6 +22,7 @@ package calculator;
import java.util.concurrent.Future;
import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Response;
import org.oasisopen.sca.annotation.Remotable;
@@ -31,7 +32,7 @@ import org.oasisopen.sca.annotation.Remo
*/
@Remotable
-public interface CalculateViaAsyncRef {
+public interface CalculateReferenceAsync {
//public Response<String> calculate( Integer i1);
@@ -39,7 +40,7 @@ public interface CalculateViaAsyncRef {
public String calculate(Integer i1);
// Aysnc Poll
- public Future<String> calculateAsync(Integer i1);
+ public Response<String> calculateAsync(Integer i1);
// Async Callback
public Future<String> calculateAsync(Integer i1, AsyncHandler<String>
handler);
Modified:
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorClient.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorClient.java?rev=1022997&r1=1022996&r2=1022997&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorClient.java
(original)
+++
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorClient.java
Fri Oct 15 16:25:02 2010
@@ -31,11 +31,11 @@ import org.oasisopen.sca.annotation.Scop
@Scope("COMPOSITE") @EagerInit
public class CalculatorClient {
- private CalculatorService calculatorService;
+ private CalculatorServiceSync calculatorService;
@Reference
- public void setCalculatorService(CalculatorService calculatorService) {
+ public void setCalculatorService(CalculatorServiceSync calculatorService) {
this.calculatorService = calculatorService;
}
Modified:
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceProxyImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceProxyImpl.java?rev=1022997&r1=1022996&r2=1022997&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceProxyImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceProxyImpl.java
Fri Oct 15 16:25:02 2010
@@ -21,6 +21,8 @@ package calculator;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+import javax.xml.ws.Response;
+
import org.oasisopen.sca.annotation.Reference;
/**
@@ -28,13 +30,13 @@ import org.oasisopen.sca.annotation.Refe
* to sync and asyn versions of the calculator service. This proxy
* exercises the various async interface alternatives
*/
-public class CalculatorServiceProxyImpl implements CalculatorService {
+public class CalculatorServiceProxyImpl implements CalculatorServiceSync {
@Reference
- protected CalculateViaAsyncRef calculatorServiceRefSync;
+ protected CalculateReferenceAsync calculatorServiceRefSync;
@Reference
- protected CalculateViaAsyncRef calculatorServiceRefAsync;
+ protected CalculateReferenceAsync calculatorServiceRefAsync;
@Override
public String calculate(Integer n1) {
@@ -52,21 +54,21 @@ public class CalculatorServiceProxyImpl
}
// exercise sync and async versions of a service interface method
- private String calculate(CalculateViaAsyncRef calculatorRef, Integer
n1) {
+ private String calculate(CalculateReferenceAsync calculatorRef, Integer
n1) {
// sync
String result = calculatorRef.calculate(1);
System.out.println("Sync client patern: result = " + result);
// async poll
- Future<String> future = calculatorRef.calculateAsync(20);
+ Response<String> response = calculatorRef.calculateAsync(20);
- while (!future.isDone()){
+ while (!response.isDone()){
System.out.println("Waiting for poll");
}
try {
- result = future.get();
+ result = response.get();
System.out.println("Async client poll patern: result =
" + result);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
@@ -78,7 +80,7 @@ public class CalculatorServiceProxyImpl
// async callback
CalculatorAsyncHandler handler = new CalculatorAsyncHandler();
- future = calculatorRef.calculateAsync(3, handler);
+ Future<String> future = calculatorRef.calculateAsync(3,
handler);
while (!future.isDone()){
System.out.println("Waiting for callback");
Copied:
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSync.java
(from r1022893,
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorService.java)
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSync.java?p2=tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSync.java&p1=tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorService.java&r1=1022893&r2=1022997&rev=1022997&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorService.java
(original)
+++
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSync.java
Fri Oct 15 16:25:02 2010
@@ -25,6 +25,6 @@ import org.oasisopen.sca.annotation.Remo
*/
@Remotable
-public interface CalculatorService {
+public interface CalculatorServiceSync {
String calculate(Integer n1);
}
Modified:
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSyncImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSyncImpl.java?rev=1022997&r1=1022996&r2=1022997&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSyncImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSyncImpl.java
Fri Oct 15 16:25:02 2010
@@ -19,7 +19,7 @@
package calculator;
-public class CalculatorServiceSyncImpl implements CalculatorService {
+public class CalculatorServiceSyncImpl implements CalculatorServiceSync {
@Override
public String calculate(Integer n1) {
