Author: sagara
Date: Tue May 29 11:57:34 2012
New Revision: 1343687
URL: http://svn.apache.org/viewvc?rev=1343687&view=rev
Log:
AXIS2-5316 - ported CallbackFuture and PollingFuture classes to use
AxisCallback .
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncUtils.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/async/PollingFuture.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncUtils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncUtils.java?rev=1343687&r1=1343686&r2=1343687&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncUtils.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncUtils.java
Tue May 29 11:57:34 2012
@@ -19,7 +19,6 @@
package org.apache.axis2.jaxws.client.async;
-import org.apache.axis2.client.async.AsyncResult;
import org.apache.axis2.jaxws.ExceptionFactory;
import org.apache.axis2.jaxws.core.MessageContext;
import org.apache.axis2.jaxws.util.Constants;
@@ -34,11 +33,6 @@ public class AsyncUtils {
private static final Log log = LogFactory.getLog(AsyncUtils.class);
private static final boolean debug = log.isDebugEnabled();
- public static MessageContext createJAXWSMessageContext(AsyncResult result)
- throws WebServiceException {
- return
AsyncUtils.createJAXWSMessageContext(result.getResponseMessageContext());
- }
-
public static MessageContext createJAXWSMessageContext(
org.apache.axis2.context.MessageContext mc) throws
WebServiceException {
MessageContext response = null;
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java?rev=1343687&r1=1343686&r2=1343687&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java
Tue May 29 11:57:34 2012
@@ -20,8 +20,7 @@
package org.apache.axis2.jaxws.client.async;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.client.async.AsyncResult;
-import org.apache.axis2.client.async.Callback;
+import org.apache.axis2.client.async.AxisCallback;
import org.apache.axis2.java.security.AccessController;
import org.apache.axis2.jaxws.core.InvocationContext;
import org.apache.axis2.jaxws.core.MessageContext;
@@ -45,7 +44,7 @@ import java.util.concurrent.FutureTask;
* to it by the JAX-WS client and using that as the thread on which to deliver
the async response
* the JAX-WS <link>javax.xml.ws.AsynchHandler</link>.
*/
-public class CallbackFuture extends Callback {
+public class CallbackFuture implements AxisCallback {
private static final Log log = LogFactory.getLog(CallbackFuture.class);
private static final boolean debug = log.isDebugEnabled();
@@ -134,15 +133,15 @@ public class CallbackFuture extends Call
return (Future<?>)task;
}
- @Override
- public void onComplete(AsyncResult result) {
+
+ public void onComplete(org.apache.axis2.context.MessageContext mc) {
if (debug) {
log.debug("JAX-WS received the async response");
}
MessageContext response = null;
try {
- response = AsyncUtils.createJAXWSMessageContext(result);
+ response = AsyncUtils.createJAXWSMessageContext(mc);
response.setInvocationContext(invocationCtx);
// make sure request and response contexts share a single parent
response.setMEPContext(invocationCtx.getRequestMessageContext().getMEPContext());
@@ -162,7 +161,7 @@ public class CallbackFuture extends Call
execute();
}
- @Override
+
public void onError(Exception e) {
// If a SOAPFault was returned by the AxisEngine, the AxisFault
// that is returned should have a MessageContext with it. Use
@@ -257,6 +256,20 @@ public class CallbackFuture extends Call
log.debug("Executor task completed");
}
}
+
+ public void onMessage(org.apache.axis2.context.MessageContext msgContext) {
+ onComplete(msgContext);
+
+ }
+
+ public void onComplete() {
+
+ }
+
+ public void onFault(org.apache.axis2.context.MessageContext msgContext) {
+ onComplete(msgContext);
+
+ }
}
class CallbackFutureTask implements Callable {
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/async/PollingFuture.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/async/PollingFuture.java?rev=1343687&r1=1343686&r2=1343687&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/async/PollingFuture.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/async/PollingFuture.java
Tue May 29 11:57:34 2012
@@ -20,8 +20,7 @@
package org.apache.axis2.jaxws.client.async;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.client.async.AsyncResult;
-import org.apache.axis2.client.async.Callback;
+import org.apache.axis2.client.async.AxisCallback;
import org.apache.axis2.jaxws.core.InvocationContext;
import org.apache.axis2.jaxws.core.MessageContext;
import org.apache.commons.logging.Log;
@@ -29,7 +28,7 @@ import org.apache.commons.logging.LogFac
import javax.xml.ws.WebServiceException;
-public class PollingFuture extends Callback {
+public class PollingFuture implements AxisCallback {
private static final Log log = LogFactory.getLog(PollingFuture.class);
@@ -46,8 +45,7 @@ public class PollingFuture extends Callb
invocationCtx = ic;
}
- @Override
- public void onComplete(AsyncResult result) {
+ public void onComplete(org.apache.axis2.context.MessageContext msgContext)
{
boolean debug = log.isDebugEnabled();
if (debug) {
log.debug("JAX-WS async response listener received the response");
@@ -55,7 +53,7 @@ public class PollingFuture extends Callb
MessageContext responseMsgCtx = null;
try {
- responseMsgCtx = AsyncUtils.createJAXWSMessageContext(result);
+ responseMsgCtx = AsyncUtils.createJAXWSMessageContext(msgContext);
responseMsgCtx.setInvocationContext(invocationCtx);
// make sure request and response contexts share a single parent
responseMsgCtx.setMEPContext(invocationCtx.getRequestMessageContext().getMEPContext());
@@ -74,7 +72,7 @@ public class PollingFuture extends Callb
response.onComplete(responseMsgCtx);
}
- @Override
+
public void onError(Exception e) {
// If a SOAPFault was returned by the AxisEngine, the AxisFault
// that is returned should have a MessageContext with it. Use
@@ -98,5 +96,18 @@ public class PollingFuture extends Callb
}
}
+ public void onMessage(org.apache.axis2.context.MessageContext msgContext) {
+ onComplete(msgContext);
+
+ }
+
+ public void onFault(org.apache.axis2.context.MessageContext msgContext) {
+ onComplete(msgContext);
+ }
+
+ public void onComplete() {
+
+ }
+
}
