Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 35640 invoked from network); 28 Nov 2005 17:36:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 28 Nov 2005 17:36:29 -0000 Received: (qmail 20697 invoked by uid 500); 28 Nov 2005 17:36:28 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 20473 invoked by uid 500); 28 Nov 2005 17:36:27 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 20453 invoked by uid 500); 28 Nov 2005 17:36:27 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 20450 invoked by uid 99); 28 Nov 2005 17:36:26 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 28 Nov 2005 09:36:25 -0800 Received: (qmail 35476 invoked by uid 65534); 28 Nov 2005 17:36:04 -0000 Message-ID: <20051128173604.35463.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r349440 - in /webservices/axis2/trunk/java: etc/ modules/addressing/src/org/apache/axis2/handlers/addressing/ modules/codegen/src/org/apache/axis2/rpc/client/ modules/codegen/src/org/apache/axis2/wsdl/template/csharp/ modules/codegen/src/or... Date: Mon, 28 Nov 2005 17:35:02 -0000 To: axis2-cvs@ws.apache.org From: chinthaka@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: chinthaka Date: Mon Nov 28 09:32:51 2005 New Revision: 349440 URL: http://svn.apache.org/viewcvs?rev=349440&view=rev Log: Cleaning up client package. One of the major intentions of this is to reduce the complexity of what client sees in this package. - moving Callback and AsycResult classes to o.a.a.client.async package - moving CallbackReceiver class to the util package. Added: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/async/ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/async/AsyncResult.java (contents, props changed) - copied, changed from r349386, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/AsyncResult.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/async/Callback.java (contents, props changed) - copied, changed from r349386, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Callback.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java (contents, props changed) - copied, changed from r349386, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/CallbackReceiver.java Removed: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/AsyncResult.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Callback.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/CallbackReceiver.java Modified: webservices/axis2/trunk/java/etc/project.properties webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/csharp/CallbackHandlerTemplate.xsl webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/csharp/InterfaceImplementationTemplate.xsl webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/LocalTestClassTemplate.xsl webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/AbstractCallbackSupporter.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/RESTCall.java webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.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/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/mail/MailCharSetEncodingTest.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/MailetRequestResponceRawXMLTest.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/tcp/TCPEchoRawXMLTest.java webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueCreateQueueCallbackHandler.java webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueDeleteQueueCallbackHandler.java webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueEnqueueCallbackHandler.java webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueListMyQueuesCallbackHandler.java webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueReadCallbackHandler.java webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java Modified: webservices/axis2/trunk/java/etc/project.properties URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/etc/project.properties?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/etc/project.properties (original) +++ webservices/axis2/trunk/java/etc/project.properties Mon Nov 28 09:32:51 2005 @@ -18,7 +18,7 @@ # ------------------------------------------------------------------- # Project Information # ------------------------------------------------------------------- -axis2_version=0.93-SNAPSHOT +axis2_version=0.93-dev # ------------------------------------------------------------------- # Dependency Repositories Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java (original) +++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java Mon Nov 28 09:32:51 2005 @@ -79,7 +79,7 @@ "No Addressing Headers present in the IN message. Addressing In Handler does nothing."); } } - msgContext.setProperty(WS_ADDRESSING_VERSION, addressingNamespace, true); + msgContext.setProperty(WS_ADDRESSING_VERSION, addressingNamespace); // extract service group context, if available extractServiceGroupContextId(header, msgContext); Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java (original) +++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java Mon Nov 28 09:32:51 2005 @@ -18,8 +18,8 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.client.Call; -import org.apache.axis2.client.Callback; import org.apache.axis2.client.InOutMEPClient; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.ServiceContext; import org.apache.axis2.description.AxisOperation; Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/csharp/CallbackHandlerTemplate.xsl URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/csharp/CallbackHandlerTemplate.xsl?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/csharp/CallbackHandlerTemplate.xsl (original) +++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/csharp/CallbackHandlerTemplate.xsl Mon Nov 28 09:32:51 2005 @@ -18,7 +18,7 @@ /// Auto generated Axis2 call back method ///</summary> /// - public void receiveResult(org.apache.axis2.client.AsyncResult result) + public void receiveResult(org.apache.axis2.client.async.AsyncResult result) { //Fill here with the code to handle the response Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/csharp/InterfaceImplementationTemplate.xsl URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/csharp/InterfaceImplementationTemplate.xsl?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/csharp/InterfaceImplementationTemplate.xsl (original) +++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/csharp/InterfaceImplementationTemplate.xsl Mon Nov 28 09:32:51 2005 @@ -86,7 +86,7 @@ ///</summary> private class CallBack:org.apache.axis2.client.CallBack { - public void onComplete(org.apache.axis2.client.AsyncResult result) + public void onComplete(org.apache.axis2.client.async.AsyncResult result) { new .().receiveResult(result); } Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl (original) +++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl Mon Nov 28 09:32:51 2005 @@ -274,8 +274,8 @@ _call.invokeNonBlocking(_operations[], _messageContext,null); - _call.invokeNonBlocking(_operations[], _messageContext, new org.apache.axis2.client.Callback(){ - public void onComplete(org.apache.axis2.client.AsyncResult result){ + _call.invokeNonBlocking(_operations[], _messageContext, new org.apache.axis2.client.async.Callback(){ + public void onComplete(org.apache.axis2.client.async.AsyncResult result){ java.lang.Object object = .fromOM(getElement(result.getResponseEnvelope(),""),.class); callback.receiveResult(()object); Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/LocalTestClassTemplate.xsl URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/LocalTestClassTemplate.xsl?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/LocalTestClassTemplate.xsl (original) +++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/LocalTestClassTemplate.xsl Mon Nov 28 09:32:51 2005 @@ -143,7 +143,7 @@ private class extends .{ public (){ super(null);} - public void receiveResult(org.apache.axis2.client.AsyncResult result) { + public void receiveResult(org.apache.axis2.client.async.AsyncResult result) { assertNotNull(result.getResponseEnvelope().getBody().getFirstChild()); } Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl (original) +++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl Mon Nov 28 09:32:51 2005 @@ -128,7 +128,7 @@ private class extends .{ public (){ super(null);} - public void receiveResult(org.apache.axis2.client.AsyncResult result) { + public void receiveResult(org.apache.axis2.client.async.AsyncResult result) { assertNotNull(result.getResponseEnvelope().getBody().getFirstChild()); } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/AbstractCallbackSupporter.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/AbstractCallbackSupporter.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/AbstractCallbackSupporter.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/AbstractCallbackSupporter.java Mon Nov 28 09:32:51 2005 @@ -34,11 +34,8 @@ * @param qNames */ protected static void optimizeContent(OMElement element, QName[] qNames){ - int length = qNames.length; - QName qName; - for (int i = 0; i < length; i++) { - qName = qNames[i]; - markElementsAsOptimized(qName,element); + for (int i = 0; i < qNames.length; i++) { + markElementsAsOptimized(qNames[i],element); } } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Call.java Mon Nov 28 09:32:51 2005 @@ -17,6 +17,7 @@ package org.apache.axis2.client; import org.apache.axis2.AxisFault; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.ServiceContext; import org.apache.axis2.deployment.util.PhasesInfo; Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java Mon Nov 28 09:32:51 2005 @@ -19,6 +19,8 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.OperationContext; @@ -35,6 +37,7 @@ import org.apache.axis2.soap.SOAPFault; import org.apache.axis2.transport.TransportListener; import org.apache.axis2.transport.TransportUtils; +import org.apache.axis2.util.CallbackReceiver; import org.apache.axis2.util.UUIDGenerator; import org.apache.wsdl.WSDLConstants; Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java Mon Nov 28 09:32:51 2005 @@ -39,8 +39,8 @@ import javax.xml.namespace.QName; import java.util.ArrayList; -import java.util.List; import java.util.HashMap; +import java.util.List; /** * This is the super class for all the MEPClients. @@ -145,7 +145,7 @@ * @return * @throws AxisFault */ - public TransportOutDescription inferTransport(EndpointReference epr) throws AxisFault { + protected TransportOutDescription inferTransport(EndpointReference epr) throws AxisFault { String transport = null; if (epr != null) { String toURL = epr.getAddress(); @@ -171,7 +171,7 @@ * @return * @throws AxisFault */ - public SOAPEnvelope createDefaultSOAPEnvelope() throws AxisFault { + protected SOAPEnvelope createDefaultSOAPEnvelope() throws AxisFault { if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(soapVersionURI)) { return OMAbstractFactory.getSOAP12Factory().getDefaultEnvelope(); } else if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(soapVersionURI)) { @@ -312,10 +312,6 @@ // ============================================================================== // Getteres and Setters // ============================================================================== - public String getSoapAction() { - return soapAction; - } - private SOAPFactory getCorrectSOAPFactory(MessageContext msgCtx) { String soapNSURI = msgCtx.getEnvelope().getNamespace().getName(); Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/RESTCall.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/RESTCall.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/RESTCall.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/RESTCall.java Mon Nov 28 09:32:51 2005 @@ -17,6 +17,7 @@ package org.apache.axis2.client; import org.apache.axis2.AxisFault; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.context.ServiceContext; import org.apache.axis2.om.OMAbstractFactory; import org.apache.axis2.om.OMElement; Copied: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/async/AsyncResult.java (from r349386, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/AsyncResult.java) URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/async/AsyncResult.java?p2=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/async/AsyncResult.java&p1=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/AsyncResult.java&r1=349386&r2=349440&rev=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/AsyncResult.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/async/AsyncResult.java Mon Nov 28 09:32:51 2005 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.axis2.client; +package org.apache.axis2.client.async; import org.apache.axis2.context.MessageContext; import org.apache.axis2.soap.SOAPEnvelope; Propchange: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/async/AsyncResult.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/async/Callback.java (from r349386, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Callback.java) URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/async/Callback.java?p2=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/async/Callback.java&p1=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Callback.java&r1=349386&r2=349440&rev=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Callback.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/async/Callback.java Mon Nov 28 09:32:51 2005 @@ -1,5 +1,4 @@ -package org.apache.axis2.client; - +package org.apache.axis2.client.async; /** * This Class is the abstract representation of a callback and is called at the completion of an Propchange: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/async/Callback.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java (from r349386, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/CallbackReceiver.java) URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java?p2=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java&p1=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/CallbackReceiver.java&r1=349386&r2=349440&rev=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/CallbackReceiver.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java Mon Nov 28 09:32:51 2005 @@ -1,7 +1,9 @@ -package org.apache.axis2.client; +package org.apache.axis2.util; import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.RelatesTo; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.context.MessageContext; import org.apache.axis2.engine.MessageReceiver; @@ -17,14 +19,14 @@ public static String SERVICE_NAME = "ClientService"; - private HashMap callbackstore; + private HashMap callbackStore; public CallbackReceiver() { - callbackstore = new HashMap(); + callbackStore = new HashMap(); } public void addCallback(String MsgID, Callback callback) { - callbackstore.put(MsgID, callback); + callbackStore.put(MsgID, callback); } public void receive(MessageContext messgeCtx) throws AxisFault { @@ -32,7 +34,7 @@ .getRelatesTo(); String messageID = relatesTO.getValue(); - Callback callback = (Callback) callbackstore.get(messageID); + Callback callback = (Callback) callbackStore.get(messageID); AsyncResult result = new AsyncResult(messgeCtx); if (callback != null) { callback.onComplete(result); Propchange: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java (original) +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java Mon Nov 28 09:32:51 2005 @@ -21,8 +21,8 @@ import junit.framework.TestCase; import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; -import org.apache.axis2.client.AsyncResult; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.description.AxisService; import org.apache.axis2.engine.util.TestConstants; import org.apache.axis2.integration.TestingUtils; 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=349440&r1=349439&r2=349440&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 Mon Nov 28 09:32:51 2005 @@ -18,8 +18,8 @@ import junit.framework.TestCase; import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; -import org.apache.axis2.client.AsyncResult; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.ServiceContext; import org.apache.axis2.description.AxisService; 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=349440&r1=349439&r2=349440&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 Mon Nov 28 09:32:51 2005 @@ -19,9 +19,9 @@ import junit.framework.TestCase; import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; -import org.apache.axis2.client.AsyncResult; import org.apache.axis2.client.Call; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.context.ServiceContext; import org.apache.axis2.description.AxisService; import org.apache.axis2.engine.util.TestConstants; 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=349440&r1=349439&r2=349440&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 Mon Nov 28 09:32:51 2005 @@ -21,9 +21,9 @@ import junit.framework.TestCase; import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; -import org.apache.axis2.client.AsyncResult; import org.apache.axis2.client.Call; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.ServiceContext; import org.apache.axis2.description.AxisService; Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java (original) +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java Mon Nov 28 09:32:51 2005 @@ -20,8 +20,8 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; -import org.apache.axis2.client.AsyncResult; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.ServiceContext; 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=349440&r1=349439&r2=349440&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 Mon Nov 28 09:32:51 2005 @@ -22,8 +22,8 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; -import org.apache.axis2.client.AsyncResult; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.ServiceContext; Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java (original) +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java Mon Nov 28 09:32:51 2005 @@ -21,8 +21,8 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; -import org.apache.axis2.client.AsyncResult; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.ServiceContext; 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=349440&r1=349439&r2=349440&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 Mon Nov 28 09:32:51 2005 @@ -21,8 +21,8 @@ import org.apache.axis2.Constants; import org.apache.axis2.attachments.utils.ImageDataSource; import org.apache.axis2.attachments.utils.ImageIO; -import org.apache.axis2.client.AsyncResult; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.context.ServiceContext; import org.apache.axis2.description.AxisService; import org.apache.axis2.engine.Echo; 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=349440&r1=349439&r2=349440&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 Mon Nov 28 09:32:51 2005 @@ -21,8 +21,8 @@ import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.attachments.ByteArrayDataSource; -import org.apache.axis2.client.AsyncResult; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.description.AxisService; import org.apache.axis2.engine.Echo; import org.apache.axis2.integration.UtilServer; 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=349440&r1=349439&r2=349440&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 Mon Nov 28 09:32:51 2005 @@ -21,8 +21,8 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; -import org.apache.axis2.client.AsyncResult; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.ConfigurationContextFactory; import org.apache.axis2.context.MessageContext; 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=349440&r1=349439&r2=349440&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 Mon Nov 28 09:32:51 2005 @@ -21,8 +21,8 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; -import org.apache.axis2.client.AsyncResult; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.ServiceContext; import org.apache.axis2.description.AxisService; Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java (original) +++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java Mon Nov 28 09:32:51 2005 @@ -20,7 +20,7 @@ import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.client.Call; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.om.OMElement; import sample.amazon.amazonSimpleQueueService.OMElementCreator; Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java (original) +++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java Mon Nov 28 09:32:51 2005 @@ -20,7 +20,7 @@ import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.client.Call; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.om.OMElement; import sample.amazon.amazonSimpleQueueService.OMElementCreator; Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java (original) +++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java Mon Nov 28 09:32:51 2005 @@ -20,7 +20,7 @@ import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.client.Call; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.om.OMElement; import sample.amazon.amazonSimpleQueueService.OMElementCreator; Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java (original) +++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java Mon Nov 28 09:32:51 2005 @@ -20,7 +20,7 @@ import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.client.Call; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.om.OMElement; import sample.amazon.amazonSimpleQueueService.OMElementCreator; Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueCreateQueueCallbackHandler.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueCreateQueueCallbackHandler.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueCreateQueueCallbackHandler.java (original) +++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueCreateQueueCallbackHandler.java Mon Nov 28 09:32:51 2005 @@ -16,8 +16,8 @@ package sample.amazon.amazonSimpleQueueService.util; -import org.apache.axis2.client.AsyncResult; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.om.OMElement; import org.apache.axis2.om.OMNode; import org.apache.axis2.soap.SOAPBody; Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueDeleteQueueCallbackHandler.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueDeleteQueueCallbackHandler.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueDeleteQueueCallbackHandler.java (original) +++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueDeleteQueueCallbackHandler.java Mon Nov 28 09:32:51 2005 @@ -16,8 +16,8 @@ package sample.amazon.amazonSimpleQueueService.util; -import org.apache.axis2.client.AsyncResult; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.om.OMElement; import org.apache.axis2.om.OMNode; import org.apache.axis2.soap.SOAPBody; Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueEnqueueCallbackHandler.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueEnqueueCallbackHandler.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueEnqueueCallbackHandler.java (original) +++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueEnqueueCallbackHandler.java Mon Nov 28 09:32:51 2005 @@ -16,8 +16,8 @@ package sample.amazon.amazonSimpleQueueService.util; -import org.apache.axis2.client.AsyncResult; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.om.OMElement; import org.apache.axis2.om.OMNode; import org.apache.axis2.soap.SOAPBody; Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueListMyQueuesCallbackHandler.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueListMyQueuesCallbackHandler.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueListMyQueuesCallbackHandler.java (original) +++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueListMyQueuesCallbackHandler.java Mon Nov 28 09:32:51 2005 @@ -16,8 +16,8 @@ package sample.amazon.amazonSimpleQueueService.util; -import org.apache.axis2.client.AsyncResult; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.om.OMElement; import org.apache.axis2.om.OMNode; import org.apache.axis2.soap.SOAPBody; Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueReadCallbackHandler.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueReadCallbackHandler.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueReadCallbackHandler.java (original) +++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueReadCallbackHandler.java Mon Nov 28 09:32:51 2005 @@ -16,8 +16,8 @@ package sample.amazon.amazonSimpleQueueService.util; -import org.apache.axis2.client.AsyncResult; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.om.OMElement; import org.apache.axis2.om.OMNode; import org.apache.axis2.soap.SOAPBody; Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java (original) +++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java Mon Nov 28 09:32:51 2005 @@ -16,8 +16,8 @@ package sample.amazon.search; -import org.apache.axis2.client.AsyncResult; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.om.OMElement; import org.apache.axis2.om.OMNode; import org.apache.axis2.soap.SOAPEnvelope; Modified: webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java (original) +++ webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java Mon Nov 28 09:32:51 2005 @@ -17,8 +17,8 @@ package sample.google.search; -import org.apache.axis2.client.AsyncResult; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.om.OMElement; import org.apache.axis2.om.OMNode; import org.apache.axis2.soap.SOAPBody; Modified: webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java (original) +++ webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java Mon Nov 28 09:32:51 2005 @@ -2,9 +2,9 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.EndpointReference; -import org.apache.axis2.client.AsyncResult; import org.apache.axis2.client.Call; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.om.OMAbstractFactory; import org.apache.axis2.om.OMElement; import org.apache.axis2.om.OMNamespace; Modified: webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java?rev=349440&r1=349439&r2=349440&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java (original) +++ webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java Mon Nov 28 09:32:51 2005 @@ -20,9 +20,9 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; -import org.apache.axis2.client.AsyncResult; import org.apache.axis2.client.Call; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.om.OMElement; import javax.xml.stream.XMLOutputFactory; 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=349440&r1=349439&r2=349440&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 Mon Nov 28 09:32:51 2005 @@ -20,9 +20,9 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; -import org.apache.axis2.client.AsyncResult; import org.apache.axis2.client.Call; -import org.apache.axis2.client.Callback; +import org.apache.axis2.client.async.AsyncResult; +import org.apache.axis2.client.async.Callback; import org.apache.axis2.om.OMElement; import javax.xml.namespace.QName;