You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2006/01/10 09:56:32 UTC
svn commit: r367529 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/client/ core/src/org/apache/axis2/description/
core/src/org/apache/axis2/util/ integration/itest/org/apache/axis2/rest/
integration/test/org/apache/axis2/engine/ ...
Author: deepal
Date: Tue Jan 10 00:55:31 2006
New Revision: 367529
URL: http://svn.apache.org/viewcvs?rev=367529&view=rev
Log:
- fixed ServiceClient.finalizeInvoke method
- So if someone use service client then he does not need to think about transport closing stuff.
- If you use Operation client with two channel , then it is require to close the transport receiver.
- We build the envelop fully in CallBackReciver and ServiceClient.sendReceive (using two transport)
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/OperationClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java
webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceCreateTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDispatchingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponseRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java
webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/OperationClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/OperationClient.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/OperationClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/OperationClient.java Tue Jan 10 00:55:31 2006
@@ -19,9 +19,8 @@
* Sets the options that should be used for this particular client. This
* resets the entire set of options to use the new options - so you'd lose
* any option cascading that may have been set up.
- *
- * @param options
- * the options
+ *
+ * @param options the options
*/
public void setOptions(Options options);
@@ -29,7 +28,7 @@
* Return the options used by this client. If you want to set a single
* option, then the right way is to do getOptions() and set specific
* options.
- *
+ *
* @return the options, which will never be null.
*/
public Options getOptions();
@@ -38,23 +37,19 @@
* Add a message context to the client for processing. This method must not
* process the message - it only records it in the operation client.
* Processing only occurs when execute() is called.
- *
- * @param mc
- * the message context
- * @throws AxisFault
- * if this is called inappropriately.
+ *
+ * @param mc the message context
+ * @throws AxisFault if this is called inappropriately.
*/
public void addMessageContext(MessageContext mc) throws AxisFault;
/**
* Return a message from the client - will return null if the requested
* message is not available.
- *
- * @param messageLabel
- * the message label of the desired message context
+ *
+ * @param messageLabel the message label of the desired message context
* @return the desired message context or null if its not available.
- * @throws AxisFault
- * if the message label is invalid
+ * @throws AxisFault if the message label is invalid
*/
public MessageContext getMessageContext(String messageLabel)
throws AxisFault;
@@ -65,10 +60,9 @@
* provides notification that a message has been received by it. Exactly
* when its executed and under what conditions is a function of the specific
* operation client.
- *
- * @param callback
- * the callback to be used when the client decides its time to
- * use it
+ *
+ * @param callback the callback to be used when the client decides its time to
+ * use it
*/
public void setCallback(Callback callback);
@@ -79,14 +73,12 @@
* an Out-In MEP, then if the Out message has been set, then executing the
* client asks it to send the message and get the In message, possibly using
* a different thread.
- *
- * @param block
- * Indicates whether execution should block or return ASAP. What
- * block means is of course a function of the specific operation
- * client.
- * @throws AxisFault
- * if something goes wrong during the execution of the operation
- * client.
+ *
+ * @param block Indicates whether execution should block or return ASAP. What
+ * block means is of course a function of the specific operation
+ * client.
+ * @throws AxisFault if something goes wrong during the execution of the operation
+ * client.
*/
public void execute(boolean block) throws AxisFault;
@@ -94,10 +86,20 @@
* Reset the operation client to a clean status after the MEP has completed.
* This is how you can reuse an operation client. NOTE: this does not reset
* the options; only the internal state so the client can be used again.
- *
- * @throws AxisFault
- * if reset is called before the MEP client has completed an
- * interaction.
+ *
+ * @throws AxisFault if reset is called before the MEP client has completed an
+ * interaction.
*/
public void reset() throws AxisFault;
+
+ /**
+ * To close the tranport if necessary , can call this method. The most usage of thie method
+ * when clinet use two tarnport for sending and receiving , there we need to remove entry from
+ * waitings calls in the transport listener queue
+ * Note : DO NOT call this method if you are not using two transport send and recive
+ *
+ * @param msgCtxt : MessageContext# which have all the trnport information
+ * @throws AxisFault : throws AxisFault if something goes worng
+ */
+ public void complete(MessageContext msgCtxt) throws AxisFault;
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java Tue Jan 10 00:55:31 2006
@@ -363,14 +363,11 @@
}
// process the resule of the invocation
if (callback.envelope != null) {
-// MessageContext resMsgctx = new MessageContext();
-// resMsgctx.setConfigurationContext(serviceContext
-// .getConfigurationContext());
MessageContext resMsgctx = callback.getMsgctx();
-// resMsgctx.setEnvelope(callback.envelope);
- ListenerManager.stop(serviceContext.getConfigurationContext(),
- resMsgctx.getTransportIn().getName().getLocalPart());
-
+ //building soap enevlop
+ callback.envelope.build();
+ //closing tranport
+ finalizeInvoke(resMsgctx);
return callback.envelope.getBody().getFirstElement();
} else {
if (callback.error instanceof AxisFault) {
@@ -442,13 +439,10 @@
*
* @throws AxisFault
*/
- public void finalizeInvoke() throws AxisFault {
- if (options.isUseSeparateListener()) {
- //TODO : need to improve this
- if (options.getTransportInProtocol() != null) {
- ListenerManager.stop(serviceContext.getConfigurationContext(),
- options.getTransportInProtocol());
- }
+ private void finalizeInvoke(MessageContext msgCtx) throws AxisFault {
+ if (options.getTransportInProtocol() != null) {
+ ListenerManager.stop(msgCtx.getConfigurationContext(),
+ msgCtx.getTransportIn().getName().getLocalPart());
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java Tue Jan 10 00:55:31 2006
@@ -367,6 +367,11 @@
completed = false;
}
+ public void complete(MessageContext msgCtxt) throws AxisFault {
+ ListenerManager.stop(msgCtxt.getConfigurationContext(),
+ msgCtxt.getTransportIn().getName().getLocalPart());
+ }
+
/**
* This class is the workhorse for a non-blocking invocation that uses a two
* way transport.
@@ -390,6 +395,7 @@
// call the callback
SOAPEnvelope resenvelope = response.getEnvelope();
+ resenvelope.build();
SOAPBody body = resenvelope.getBody();
if (body.hasFault()) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java Tue Jan 10 00:55:31 2006
@@ -2,6 +2,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.client.ListenerManager;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.async.Callback;
@@ -314,5 +315,10 @@
}
mc = null;
completed = false;
+ }
+
+ public void complete(MessageContext msgCtxt) throws AxisFault {
+ ListenerManager.stop(msgCtxt.getConfigurationContext(),
+ msgCtxt.getTransportIn().getName().getLocalPart());
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java Tue Jan 10 00:55:31 2006
@@ -2,6 +2,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.RelatesTo;
+import org.apache.axis2.client.ListenerManager;
import org.apache.axis2.client.async.AsyncResult;
import org.apache.axis2.client.async.Callback;
import org.apache.axis2.context.MessageContext;
@@ -35,8 +36,9 @@
if (callback != null) {
callback.onComplete(result);
callback.setComplete(true);
- //TODO : need to close the InputStream at this point ,
- // first need to read the enevelop fully and then close the in
+ //closing the tranport
+ ListenerManager.stop(messageCtx.getConfigurationContext(),
+ messageCtx.getTransportIn().getName().getLocalPart());
} else {
throw new AxisFault("The Callback realtes to MessageID " + messageID + " is not found");
}
Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java Tue Jan 10 00:55:31 2006
@@ -100,6 +100,5 @@
System.out));
- sender.finalizeInvoke();
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java Tue Jan 10 00:55:31 2006
@@ -115,6 +115,5 @@
TestingUtils.campareWithCreatedOMElement(result);
- sender.finalizeInvoke();
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java Tue Jan 10 00:55:31 2006
@@ -110,6 +110,5 @@
OMElement result = sender.sendReceive(payload);
TestingUtils.campareWithCreatedOMElement(result);
- sender.finalizeInvoke();
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java Tue Jan 10 00:55:31 2006
@@ -114,7 +114,6 @@
"Server was shutdown as the async response take too long to complete");
}
}
- sender.finalizeInvoke();
}
@@ -164,7 +163,6 @@
"Server is shutdown as the Async response take too longs time");
}
}
- sender.finalizeInvoke();
}
log.info("send the request");
@@ -186,7 +184,6 @@
TestingUtils.campareWithCreatedOMElement(result);
- sender.finalizeInvoke();
}
}
@@ -209,7 +206,6 @@
OMElement result = sender.sendReceive(payload);
TestingUtils.campareWithCreatedOMElement(result);
- sender.finalizeInvoke();
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java Tue Jan 10 00:55:31 2006
@@ -89,7 +89,6 @@
OMElement result = sender.sendReceive(operationName, method);
TestingUtils.campareWithCreatedOMElement(result);
- sender.finalizeInvoke();
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java Tue Jan 10 00:55:31 2006
@@ -127,7 +127,6 @@
}
log.info("send the reqest");
} finally {
- sender.finalizeInvoke();
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java Tue Jan 10 00:55:31 2006
@@ -114,7 +114,6 @@
}
}
log.info("send the request");
- sender.finalizeInvoke();
}
public void testEchoXMLSync() throws Exception {
@@ -133,7 +132,6 @@
OMElement result = sender.sendReceive(payload);
TestingUtils.campareWithCreatedOMElement(result);
- sender.finalizeInvoke();
}
public void testCorrectSOAPEnvelope() throws Exception {
@@ -153,7 +151,6 @@
OMElement result = sender.sendReceive(payload);
TestingUtils.campareWithCreatedOMElement(result);
- sender.finalizeInvoke();
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceCreateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceCreateTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceCreateTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceCreateTest.java Tue Jan 10 00:55:31 2006
@@ -72,6 +72,5 @@
OMElement response = client.invokeBlocking(new QName("add"), args.toArray());
assertEquals(Integer.parseInt(response.getFirstElement().getText()), 300);
- client.finalizeInvoke();
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDispatchingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDispatchingTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDispatchingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDispatchingTest.java Tue Jan 10 00:55:31 2006
@@ -75,7 +75,6 @@
OMElement result = sender.sendReceive(payload);
TestingUtils.campareWithCreatedOMElement(result);
- sender.finalizeInvoke();
}
public void testDispatchWithURLAndSOAPAction() throws Exception {
@@ -99,7 +98,6 @@
OMElement result = sender.sendReceive(payload);
TestingUtils.campareWithCreatedOMElement(result);
- sender.finalizeInvoke();
}
public void testDispatchWithSOAPBody() throws Exception {
@@ -124,6 +122,5 @@
OMElement result = sender.sendReceive(payload);
TestingUtils.campareWithCreatedOMElement(result);
- sender.finalizeInvoke();
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java Tue Jan 10 00:55:31 2006
@@ -63,7 +63,6 @@
OMElement result = sender.sendReceive(payload);
TestingUtils.campareWithCreatedOMElement(result);
- sender.finalizeInvoke();
log.info("Finishing Thread number " + threadNumber + " .....");
} catch (AxisFault axisFault) {
thrownException = axisFault;
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java Tue Jan 10 00:55:31 2006
@@ -50,7 +50,6 @@
OMElement result = sender.sendReceive(payload);
TestingUtils.campareWithCreatedOMElement(result);
- sender.finalizeInvoke();
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java Tue Jan 10 00:55:31 2006
@@ -106,7 +106,6 @@
result.build();
result.serialize(writer);
writer.flush();
- sender.finalizeInvoke();
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java Tue Jan 10 00:55:31 2006
@@ -139,7 +139,6 @@
"Server was shutdown as the async response take too long to complete");
}
}
- sender.finalizeInvoke();
}
public void testEchoXMLSync() throws Exception {
@@ -158,7 +157,6 @@
result.serialize(XMLOutputFactory.newInstance().createXMLStreamWriter(
System.out));
- sender.finalizeInvoke();
}
public void testEchoXMLCompleteSync() throws Exception {
@@ -185,7 +183,6 @@
result.serialize(XMLOutputFactory.newInstance().createXMLStreamWriter(
System.out));
- sender.finalizeInvoke();
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java Tue Jan 10 00:55:31 2006
@@ -157,7 +157,6 @@
"Server was shutdown as the async response take too long to complete");
}
}
- sender.finalizeInvoke();
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponseRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponseRawXMLTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponseRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponseRawXMLTest.java Tue Jan 10 00:55:31 2006
@@ -147,7 +147,6 @@
"Async response is taking too long[10s+]. Server is being shut down.");
}
}
- sender.finalizeInvoke();
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java Tue Jan 10 00:55:31 2006
@@ -119,7 +119,6 @@
OMText binaryNode = (OMText) ele1.getFirstOMChild();
compareWithActualOMText(binaryNode);
log.info("" + i);
- sender.finalizeInvoke();
UtilServer.unDeployClientService();
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java Tue Jan 10 00:55:31 2006
@@ -142,7 +142,6 @@
"Server was shutdown as the async response take too long to complete");
}
}
- sender.finalizeInvoke();
}
public void testEchoXMLSync() throws Exception {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java Tue Jan 10 00:55:31 2006
@@ -137,7 +137,6 @@
"Server was shutdown as the async response take too long to complete");
}
}
- sender.finalizeInvoke();
}
public void testEchoXMLSync() throws Exception {
@@ -160,7 +159,6 @@
OMElement data = (OMElement) result.getFirstOMChild();
compareWithCreatedOMText(data.getText());
- sender.finalizeInvoke();
log.info("" + i);
UtilServer.unDeployClientService();
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/processingModel/SoapProcessingModelTest.java Tue Jan 10 00:55:31 2006
@@ -105,7 +105,6 @@
fail("Exception Occurred !! ." + e.getMessage());
throw new AxisFault(e);
} finally {
- serviceClient.finalizeInvoke();
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java Tue Jan 10 00:55:31 2006
@@ -361,7 +361,6 @@
MyBean resBean = (MyBean) BeanUtil.deserialize(MyBean.class, response.getFirstElement());
assertNotNull(resBean);
assertEquals(resBean.getAge(), 159);
- rpcClient.finalizeInvoke();
}
@@ -422,7 +421,6 @@
MyBean resBean = (MyBean) BeanUtil.deserialize(MyBean.class, response.getFirstElement());
assertNotNull(resBean);
assertEquals(resBean.getAge(), 159);
- rpcClient.finalizeInvoke();
}
@@ -488,7 +486,6 @@
Object [] resBean = BeanUtil.deserialize(response, args.toArray());
assertNotNull(resBean);
assertEquals(((Boolean) resBean[0]).booleanValue(), true);
- rpcClient.finalizeInvoke();
}
private OMElement getOMelemnt(String str, OMFactory fac) throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java Tue Jan 10 00:55:31 2006
@@ -129,7 +129,6 @@
MyBean resBean = (MyBean) BeanUtil.deserialize(MyBean.class, response.getFirstElement());
assertNotNull(resBean);
assertEquals(resBean.getAge(), 159);
- sender.finalizeInvoke();
}
private void configureSystem(String opName) throws AxisFault {
@@ -182,7 +181,6 @@
// MyBean resBean =(MyBean) new BeanSerializer(MyBean.class,response).deserilze();
assertNotNull(resBean);
assertEquals(resBean.getAge(), 100);
- sender.finalizeInvoke();
}
@@ -203,7 +201,6 @@
args.add("foo");
OMElement response = sender.invokeBlocking(operationName, args.toArray());
assertEquals(response.getFirstElement().getText(), "foo");
- sender.finalizeInvoke();
}
public void testEchoInt() throws AxisFault {
@@ -224,7 +221,6 @@
OMElement response = sender.invokeBlocking(operationName, args.toArray());
assertEquals(Integer.parseInt(response.getFirstElement().getText()), 100);
- sender.finalizeInvoke();
}
public void testAdd() throws AxisFault {
@@ -244,7 +240,6 @@
OMElement response = sender.invokeBlocking(operationName, args.toArray());
assertEquals(Integer.parseInt(response.getFirstElement().getText()), 300);
- sender.finalizeInvoke();
}
public void testDivide() throws AxisFault {
@@ -266,7 +261,6 @@
args.add("0");
OMElement response = sender.invokeBlocking(operationName, args.toArray());
assertEquals(response.getFirstElement().getText(), "INF");
- sender.finalizeInvoke();
}
public void testEchoBool() throws AxisFault {
@@ -287,7 +281,6 @@
OMElement response = sender.invokeBlocking(operationName, args.toArray());
assertEquals(Boolean.valueOf(response.getFirstElement().getText()).booleanValue(), true);
- sender.finalizeInvoke();
}
public void testEchoByte() throws AxisFault {
@@ -308,7 +301,6 @@
args.add("1");
OMElement response = sender.invokeBlocking(operationName, args.toArray());
assertEquals(Byte.parseByte(response.getFirstElement().getText()), 1);
- sender.finalizeInvoke();
}
public void testCompany() throws AxisFault {
@@ -348,7 +340,6 @@
ArrayList args = new ArrayList();
args.add(com);
sender.invokeBlocking(operationName, args.toArray());
- sender.finalizeInvoke();
}
public void testEchoOM() throws AxisFault {
@@ -368,7 +359,6 @@
args.add("1");
OMElement response = sender.invokeBlocking(operationName, args.toArray());
assertEquals(Byte.parseByte(response.getFirstElement().getText()), 1);
- sender.finalizeInvoke();
}
public void testCalender() throws AxisFault {
@@ -390,7 +380,6 @@
args.add(zulu.format(date));
OMElement response = sender.invokeBlocking(operationName, args.toArray());
assertEquals(response.getFirstElement().getText(), zulu.format(date));
- sender.finalizeInvoke();
}
@@ -427,7 +416,6 @@
MyBean resBean = (MyBean) response[0];
assertNotNull(resBean);
assertEquals(resBean.getAge(), 100);
- sender.finalizeInvoke();
}
public void testechoInt2() throws AxisFault {
@@ -451,7 +439,6 @@
Object [] response = sender.invokeBlocking(operationName, args.toArray(), ret.toArray());
assertEquals(((Integer) response[0]).intValue(), 100);
- sender.finalizeInvoke();
}
public void testmultireturn() throws AxisFault {
@@ -478,7 +465,6 @@
assertEquals(((Integer) response[0]).intValue(), 10);
assertEquals(response[1], "foo");
// assertEquals(Byte.parseByte(response.getFirstElement().getText()),1);
- sender.finalizeInvoke();
}
public void testmulReturn() throws AxisFault {
@@ -500,7 +486,6 @@
sender.invokeBlocking(operationName, args.toArray());
// assertEquals(response.getFirstElement().getText(), "foo");
- sender.finalizeInvoke();
}
@@ -519,7 +504,6 @@
OMElement elem = sender.sendReceive(getpayLoad());
assertEquals(elem.getFirstElement().getText(), "abcdefghiklm10");
- sender.finalizeInvoke();
}
private OMElement getpayLoad() throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java Tue Jan 10 00:55:31 2006
@@ -142,7 +142,6 @@
"Server was shutdown as the async response take too long to complete");
}
}
- sender.finalizeInvoke();
}
public void testEchoXMLSync() throws Exception {
@@ -158,7 +157,6 @@
result.serialize(XMLOutputFactory.newInstance().createXMLStreamWriter(
System.out));
- sender.finalizeInvoke();
}
public void testEchoXMLCompleteSync() throws Exception {
@@ -182,7 +180,6 @@
result.serialize(XMLOutputFactory.newInstance().createXMLStreamWriter(
System.out));
- sender.finalizeInvoke();
}
@@ -226,7 +223,6 @@
assertNotNull(env);
env.getBody().serialize(XMLOutputFactory.newInstance().createXMLStreamWriter(
System.out));
- sender.finalizeInvoke();
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java Tue Jan 10 00:55:31 2006
@@ -137,7 +137,6 @@
}
} finally {
if(finish) {
- sender.finalizeInvoke();
}
}
Modified: webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java Tue Jan 10 00:55:31 2006
@@ -57,7 +57,6 @@
System.out.println(writer.toString());
//Need to close the Client Side Listener.
- sender.finalizeInvoke();
} catch (AxisFault axisFault) {
axisFault.printStackTrace();
Modified: webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java?rev=367529&r1=367528&r2=367529&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java Tue Jan 10 00:55:31 2006
@@ -78,7 +78,6 @@
Thread.sleep(1000);
}
//Need to close the Client Side Listener.
- sender.finalizeInvoke();
} catch (AxisFault axisFault) {
axisFault.printStackTrace();