axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chinth...@apache.org
Subject svn commit: r358546 [1/2] - in /webservices/axis2/trunk/java/modules: addressing/src/org/apache/axis2/handlers/addressing/ addressing/test/org/apache/axis2/handlers/addressing/ core/src/org/apache/axis2/addressing/ core/src/org/apache/axis2/client/ cor...
Date Thu, 22 Dec 2005 10:01:57 GMT
Author: chinthaka
Date: Thu Dec 22 01:59:45 2005
New Revision: 358546

URL: http://svn.apache.org/viewcvs?rev=358546&view=rev
Log:
Options is now directly injected in to the message context, rather than copying each and every property from the options to the message context. 
Since Options encapsulates all the addressing information, I removed MessageInformationHeaders class also, which was used to group all the addressing information. 
This Change requires some changes in the Stub as well. This will be done soon as a part of the client refactoring.

Removed:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/MessageInformationHeaders.java
Modified:
    webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
    webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
    webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.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/Options.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java
    webservices/axis2/trunk/java/modules/core/webapp/HappyAxis.jsp
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/GetTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/PostTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
    webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTGetTest.java
    webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java
    webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java
    webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/complex/EchoBlockingClient.java
    webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/EchoBlockingClient.java
    webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java
    webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java
    webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java
    webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/complex/EchoBlockingClient.java
    webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/simple/EchoBlockingClient.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.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/EchoRawRuntimeProxyTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunckedTest.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/FaultHandlingTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.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/ServiceGroupContextTest.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/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/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/EchoRawMTOMCommonsChunkingTest.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/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.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/search/AsynchronousClient.java
    webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java
    webservices/axis2/trunk/java/modules/samples/src/sample/mtom/imagetransfer/client/MTOMClientModel.java
    webservices/axis2/trunk/java/modules/samples/src/sample/mtom/interop/client/InteropClientModel.java
    webservices/axis2/trunk/java/modules/samples/src/sample/security/Client.java
    webservices/axis2/trunk/java/modules/samples/src/sample/sgccalculator/CalcClient.java
    webservices/axis2/trunk/java/modules/samples/src/sample/yahooservices/RESTSearch/RESTSearchClient.java
    webservices/axis2/trunk/java/modules/samples/src/userguide/clients/ClientForWebServiceWithModule.java
    webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoBlockingClient.java
    webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java
    webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoBlockingWsaBasedClient.java
    webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java
    webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java
    webservices/axis2/trunk/java/modules/samples/src/userguide/clients/RESTClient.java
    webservices/axis2/trunk/java/modules/samples/src/userguide/clients/TCPClient.java

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=358546&r1=358545&r2=358546&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 Thu Dec 22 01:59:45 2005
@@ -20,8 +20,8 @@
 import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.addressing.MessageInformationHeaders;
 import org.apache.axis2.addressing.RelatesTo;
+import org.apache.axis2.client.Options;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceGroupContext;
 import org.apache.axis2.om.OMAttribute;
@@ -48,19 +48,19 @@
             addressingHeaders = header.getHeaderBlocksWithNSURI(Submission.WSA_NAMESPACE);
             if (addressingHeaders != null) {
                 addressingNamespace = Submission.WSA_NAMESPACE;
-                extractAddressingSubmissionInformationFromHeaders(
+                extractCommonAddressingParameters(
                         header,
-                        msgContext.getMessageInformationHeaders(),
-                        addressingHeaders);
+                        msgContext.getOptions(),
+                        addressingHeaders, Submission.WSA_NAMESPACE);
             } else {
                 addressingHeaders = header.getHeaderBlocksWithNSURI(Final.WSA_NAMESPACE);
                 if (addressingHeaders != null) {
                     addressingNamespace = Final.WSA_NAMESPACE;
-                    extractAddressingFinalInformationFromHeaders(
+                    extractCommonAddressingParameters(
                             header,
-                            msgContext.getMessageInformationHeaders(),
-                            addressingHeaders);
-                    extractReferenceParameters(header, msgContext.getMessageInformationHeaders());
+                            msgContext.getOptions(),
+                            addressingHeaders, Final.WSA_NAMESPACE);
+                    extractReferenceParameters(header, msgContext.getOptions());
 
                 } else {
                     // Addressing headers are not present in the SOAP message
@@ -101,61 +101,28 @@
      * here this will check for header blocks with the above attribute and will put them in message information header collection
      *
      * @param header
-     * @param messageInformationHeaders
+     * @param messageContextOptions
      */
     private void extractReferenceParameters(
             SOAPHeader header,
-            MessageInformationHeaders messageInformationHeaders) {
+            Options messageContextOptions) {
         Iterator headerBlocks = header.getChildren();
         while (headerBlocks.hasNext()) {
             SOAPHeaderBlock soapHeaderBlock = (SOAPHeaderBlock) headerBlocks.next();
-            if (Final
-                    .WSA_TYPE_ATTRIBUTE_VALUE
-                    .equals(
-                            soapHeaderBlock
-                                    .getAttribute(
-                                            new QName(
-                                                    Final.WSA_NAMESPACE,
-                                                    Final.WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE))
-                                    .getAttributeValue())) {
-                messageInformationHeaders.addReferenceParameter(soapHeaderBlock);
+            if (Final.WSA_TYPE_ATTRIBUTE_VALUE.equals(soapHeaderBlock.getAttribute(
+                                            new QName(Final.WSA_NAMESPACE,
+                                                    Final.WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE)).getAttributeValue())) {
+                messageContextOptions.addReferenceParameter(soapHeaderBlock);
             }
         }
     }
 
-    private void extractAddressingFinalInformationFromHeaders(
+    protected Options extractCommonAddressingParameters(
             SOAPHeader header,
-            MessageInformationHeaders messageInformationHeaders,
-            ArrayList addressingHeaders)
-            throws AddressingException {
-        extractCommonAddressingParameters(
-                header,
-                messageInformationHeaders,
-                addressingHeaders,
-                Final.WSA_NAMESPACE);
-    }
-
-    private void extractAddressingSubmissionInformationFromHeaders(
-            SOAPHeader header,
-            MessageInformationHeaders messageInformationHeaders,
-            ArrayList addressingHeaders)
-            throws AddressingException {
-        extractCommonAddressingParameters(
-                header,
-                messageInformationHeaders,
-                addressingHeaders,
-                Submission.WSA_NAMESPACE);
-    }
-
-    public MessageInformationHeaders extractCommonAddressingParameters(
-            SOAPHeader header,
-            MessageInformationHeaders messageInformationHeaders,
+            Options messageContextOptions,
             ArrayList addressingHeaders,
             String addressingNamespace)
             throws AddressingException {
-        if (messageInformationHeaders == null) {
-            messageInformationHeaders = new MessageInformationHeaders();
-        }
 
         Iterator addressingHeadersIt = addressingHeaders.iterator();
         while (addressingHeadersIt.hasNext()) {
@@ -164,42 +131,42 @@
             if (AddressingConstants.WSA_TO.equals(soapHeaderBlock.getLocalName())) {
                 //here the addressing epr overidde what ever already there in the message context
                 epr = new EndpointReference(soapHeaderBlock.getText());
-                messageInformationHeaders.setTo(epr);
+                messageContextOptions.setTo(epr);
 
                 // check for reference parameters
                 extractToEprReferenceParameters(epr, header);
                 soapHeaderBlock.setProcessed();
 
             } else if (AddressingConstants.WSA_FROM.equals(soapHeaderBlock.getLocalName())) {
-                epr = messageInformationHeaders.getFrom();
+                epr = messageContextOptions.getFrom();
                 if (epr == null) {
                     epr = new EndpointReference("");  // I don't know the address now. Let me pass the empty string now and fill this
                                                       // once I process the Elements under this. 
-                    messageInformationHeaders.setFrom(epr);
+                    messageContextOptions.setFrom(epr);
                 }
                 extractEPRInformation(soapHeaderBlock, epr, addressingNamespace);
                 soapHeaderBlock.setProcessed();
             } else if (AddressingConstants.WSA_REPLY_TO.equals(soapHeaderBlock.getLocalName())) {
-                epr = messageInformationHeaders.getReplyTo();
+                epr = messageContextOptions.getReplyTo();
                 if (epr == null) {
                     epr = new EndpointReference("");
-                    messageInformationHeaders.setReplyTo(epr);
+                    messageContextOptions.setReplyTo(epr);
                 }
                 extractEPRInformation(soapHeaderBlock, epr, addressingNamespace);
                 soapHeaderBlock.setProcessed();
             } else if (AddressingConstants.WSA_FAULT_TO.equals(soapHeaderBlock.getLocalName())) {
-                epr = messageInformationHeaders.getFaultTo();
+                epr = messageContextOptions.getFaultTo();
                 if (epr == null) {
                     epr = new EndpointReference("");
-                    messageInformationHeaders.setFaultTo(epr);
+                    messageContextOptions.setFaultTo(epr);
                 }
                 extractEPRInformation(soapHeaderBlock, epr, addressingNamespace);
                 soapHeaderBlock.setProcessed();
             } else if (AddressingConstants.WSA_MESSAGE_ID.equals(soapHeaderBlock.getLocalName())) {
-                messageInformationHeaders.setMessageId(soapHeaderBlock.getText());
+                messageContextOptions.setMessageId(soapHeaderBlock.getText());
                 soapHeaderBlock.setProcessed();
             } else if (AddressingConstants.WSA_ACTION.equals(soapHeaderBlock.getLocalName())) {
-                messageInformationHeaders.setAction(soapHeaderBlock.getText());
+                messageContextOptions.setAction(soapHeaderBlock.getText());
                 soapHeaderBlock.setProcessed();
             } else if (AddressingConstants.WSA_RELATES_TO.equals(soapHeaderBlock.getLocalName())) {
                 String address = soapHeaderBlock.getText();
@@ -216,13 +183,12 @@
                                 relationshipType == null
                                         ? relationshipTypeDefaultValue
                                         : relationshipType.getAttributeValue());
-                messageInformationHeaders.setRelatesTo(relatesTo);
+                messageContextOptions.setRelatesTo(relatesTo);
                 soapHeaderBlock.setProcessed();
 
             }
         }
-
-        return messageInformationHeaders;
+        return messageContextOptions;
     }
 
     private void extractToEprReferenceParameters(EndpointReference toEPR, SOAPHeader header) {

Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java Thu Dec 22 01:59:45 2005
@@ -20,9 +20,9 @@
 import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.addressing.MessageInformationHeaders;
 import org.apache.axis2.addressing.RelatesTo;
 import org.apache.axis2.addressing.ServiceName;
+import org.apache.axis2.client.Options;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.om.OMAbstractFactory;
 import org.apache.axis2.om.OMElement;
@@ -39,23 +39,12 @@
 public class AddressingOutHandler extends AddressingHandler {
 
 
-    // IN message, if any, has messageId and replyTo and faultTo addresses that needs to be used
-    // in the OUT message. User may sometimes override these values, at his discretion .The following
-    // boolean variable will create room for that.
-    private boolean overrideINMessageInformation = false;
-
     OMNamespace addressingNamespaceObject;
     String addressingNamespace;
 
 
     public void invoke(MessageContext msgContext) throws AxisFault {
 
-
-        if (msgContext.getMessageInformationHeaders() == null) {
-            return;
-        }
-
-        // first check whether current message context can be used to determin the addressing version to be used
         Object addressingVersionFromCurrentMsgCtxt = msgContext.getProperty(WS_ADDRESSING_VERSION);
         if (addressingVersionFromCurrentMsgCtxt != null) {
             // since we support only two addressing versions I can avoid multiple  ifs here.
@@ -86,8 +75,7 @@
                         addressingNamespace, WSA_DEFAULT_PREFIX);
 
 
-        MessageInformationHeaders messageInformationHeaders =
-                msgContext.getMessageInformationHeaders();
+        Options messageContextOptions = msgContext.getOptions();
         SOAPEnvelope envelope = msgContext.getEnvelope();
         SOAPHeader soapHeader = envelope.getHeader();
 
@@ -98,7 +86,7 @@
         envelope.declareNamespace(addressingNamespaceObject);
 
         // processing WSA To
-        EndpointReference epr = messageInformationHeaders.getTo();
+        EndpointReference epr = messageContextOptions.getTo();
         if (epr != null && !isAddressingHeaderAlreadyAvailable(WSA_TO, envelope)) {
 
             String address = epr.getAddress();
@@ -114,14 +102,14 @@
         }
 
         // processing WSA Action
-        String action = messageInformationHeaders.getAction();
+        String action = messageContextOptions.getAction();
         if (action != null && !isAddressingHeaderAlreadyAvailable(WSA_ACTION, envelope)) {
             processStringInfo(action, WSA_ACTION, envelope);
         }
 
         // processing WSA replyTo
         if (!isAddressingHeaderAlreadyAvailable(WSA_REPLY_TO, envelope)) {
-            epr = messageInformationHeaders.getReplyTo();
+            epr = messageContextOptions.getReplyTo();
             if (epr == null) {//optional
                 // setting anonymous URI. Defaulting to Final.
                 String anonymousURI = Final.WSA_ANONYMOUS_URL;
@@ -139,23 +127,23 @@
             addToSOAPHeader(epr, AddressingConstants.WSA_REPLY_TO, envelope);
         }
 
-        epr = messageInformationHeaders.getFrom();
+        epr = messageContextOptions.getFrom();
         if (epr != null) {//optional
             addToSOAPHeader(epr, AddressingConstants.WSA_FROM, envelope);
         }
 
-        epr = messageInformationHeaders.getFaultTo();
+        epr = messageContextOptions.getFaultTo();
         if (epr != null) {//optional
             addToSOAPHeader(epr, AddressingConstants.WSA_FAULT_TO, envelope);
         }
 
-        String messageID = messageInformationHeaders.getMessageId();
+        String messageID = messageContextOptions.getMessageId();
         if (messageID != null && !isAddressingHeaderAlreadyAvailable(WSA_MESSAGE_ID, envelope)) {//optional
             processStringInfo(messageID, WSA_MESSAGE_ID, envelope);
         }
 
         if (!isAddressingHeaderAlreadyAvailable(WSA_RELATES_TO, envelope)) {
-            RelatesTo relatesTo = messageInformationHeaders.getRelatesTo();
+            RelatesTo relatesTo = messageContextOptions.getRelatesTo();
             OMElement relatesToHeader = null;
 
             if (relatesTo != null) {

Modified: webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java Thu Dec 22 01:59:45 2005
@@ -19,7 +19,7 @@
 import junit.framework.TestCase;
 import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.addressing.MessageInformationHeaders;
+import org.apache.axis2.client.Options;
 import org.apache.axis2.handlers.util.TestUtil;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.SOAPHeader;
@@ -60,27 +60,28 @@
                     testFileName);
 
             SOAPHeader header = ((SOAPEnvelope) omBuilder.getDocumentElement()).getHeader();
-            MessageInformationHeaders messageInformationHeaders =
+            Options options =
                     inHandler.extractCommonAddressingParameters(header,
-                            null,
+                            new Options(),
                             header.getHeaderBlocksWithNSURI(
                                     AddressingConstants.Submission.WSA_NAMESPACE),
                             AddressingConstants.Submission.WSA_NAMESPACE);
 
-            if (messageInformationHeaders == null) {
+            if (options == null) {
                 fail(
                         "Addressing Information Headers have not been retrieved properly");
             }
             assertEquals("action header is not correct",
-                    messageInformationHeaders.getAction(),
+                    options.getAction(),
                     action);
             assertEquals("action header is not correct",
-                    messageInformationHeaders.getMessageId().trim(),
+                    options.getMessageId().trim(),
                     messageID.trim());
 
-            assertFromEPR(messageInformationHeaders.getFrom());
+            assertFromEPR(options.getFrom());
 
         } catch (Exception e) {
+            e.printStackTrace();
             log.info(e.getMessage());
             fail(" An Exception has occured " + e.getMessage());
         }
@@ -98,16 +99,16 @@
                     wsaFinalTestFile);
             inHandler.addressingNamespace = AddressingConstants.Final.WSA_NAMESPACE;
             SOAPHeader header = ((SOAPEnvelope) omBuilder.getDocumentElement()).getHeader();
-            MessageInformationHeaders messageInformationHeaders =
+            Options options =
                     inHandler.extractCommonAddressingParameters(header,
-                            null,
+                            new Options(),
                             header.getHeaderBlocksWithNSURI(
                                     AddressingConstants.Final.WSA_NAMESPACE),
                             AddressingConstants.Final.WSA_NAMESPACE);
-            assertNotNull(messageInformationHeaders);
-            assertNotNull(messageInformationHeaders.getTo());
+            assertNotNull(options);
+            assertNotNull(options.getTo());
 
-            Map allReferenceParameters = messageInformationHeaders.getTo().getAllReferenceParameters();
+            Map allReferenceParameters = options.getTo().getAllReferenceParameters();
             assertNotNull(allReferenceParameters);
             QName qName = new QName("http://ws.apache.org/namespaces/axis2", "ParamOne", "axis2");
             assertNotNull(allReferenceParameters.get(qName));

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=358546&r1=358545&r2=358546&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 Thu Dec 22 01:59:45 2005
@@ -95,15 +95,15 @@
         }
 
         if (clientOptions.isUseSeparateListener()) {
-            if (clientOptions.getListenerTransport() == null) {
-                clientOptions.setListenerTransport(
+            if (clientOptions.getTransportInDescription() == null) {
+                clientOptions.setTransportInDescription(
                         serviceContext.getConfigurationContext().getAxisConfiguration().getTransportIn(
                                 clientOptions.getSenderTransport().getName()));
             }
         }
 
         if (msgctx.getTransportIn() == null) {
-            msgctx.setTransportIn(clientOptions.getListenerTransport());
+            msgctx.setTransportIn(clientOptions.getTransportInDescription());
         }
 
         if (msgctx.getTransportOut() == null) {
@@ -118,7 +118,7 @@
     public void close() throws AxisFault {
         if (clientOptions.isUseSeparateListener()) {
             ListenerManager.stop(serviceContext.getConfigurationContext(),
-                    clientOptions.getListenerTransport().getName().getLocalPart());
+                    clientOptions.getTransportInDescription().getName().getLocalPart());
         }
 
 
@@ -127,7 +127,7 @@
     protected void configureTransportInformation(MessageContext msgCtx) throws AxisFault {
         AxisConfiguration axisConfig =
                 this.serviceContext.getConfigurationContext().getAxisConfiguration();
-        String listenerTransportProtocol = clientOptions.getListenerTransportProtocol();
+        String listenerTransportProtocol = clientOptions.getTransportInProtocol();
 
         if (axisConfig != null) {
             if (clientOptions.isUseSeparateListener()) {
@@ -140,7 +140,7 @@
                                 listenerTransportProtocol));
                     }
 
-                    clientOptions.setListenerTransport(transportIn);
+                    clientOptions.setTransportInDescription(transportIn);
                 }
             }
 
@@ -155,7 +155,7 @@
                 throw new AxisFault(Messages.getMessage("2channelNeedAddressing"));
             }
 
-            ListenerManager.makeSureStarted(clientOptions.getListenerTransportProtocol(),
+            ListenerManager.makeSureStarted(clientOptions.getTransportInProtocol(),
                     serviceContext.getConfigurationContext());
         }
     }
@@ -247,7 +247,7 @@
             operationContext.setProperties(clientOptions.getProperties());
 
             // Send the SOAP Message and receive a response
-            MessageContext response = send(msgctx, clientOptions.getListenerTransport());
+            MessageContext response = send(msgctx, clientOptions.getTransportInDescription());
 
             // check for a fault and return the result
             SOAPEnvelope resenvelope = response.getEnvelope();
@@ -325,7 +325,7 @@
                                 .replyToEPR(serviceContext.getConfigurationContext(),
                                         serviceContext.getAxisService().getName() + "/"
                                                 + axisop.getName().getLocalPart(), clientOptions
-                                        .getListenerTransport().getName().getLocalPart());
+                                        .getTransportInDescription().getName().getLocalPart());
 
                 if (msgctx.getReplyTo() == null) {
                     msgctx.setReplyTo(replyToFromTransport);
@@ -422,7 +422,7 @@
             try {
 
                 // send the request and wait for reponse
-                MessageContext response = send(msgctx, clientOptions.getListenerTransport());
+                MessageContext response = send(msgctx, clientOptions.getTransportInDescription());
 
                 // call the callback
                 SOAPEnvelope resenvelope = response.getEnvelope();

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=358546&r1=358545&r2=358546&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 Thu Dec 22 01:59:45 2005
@@ -18,7 +18,6 @@
 package org.apache.axis2.client;
 
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
@@ -206,27 +205,6 @@
         }
     }
 
-    private void extractPropertiesFromOptionsToContexts(MessageContext msgCtx) {
-
-        // copy addressing parameters
-        msgCtx.setTo(clientOptions.getTo());
-        msgCtx.setFrom(clientOptions.getFrom());
-        msgCtx.setFaultTo(clientOptions.getFaultTo());
-        msgCtx.setReplyTo(clientOptions.getReplyTo());
-        msgCtx.setRelatesTo(clientOptions.getRelatesTo());
-        msgCtx.setMessageID(((clientOptions.getMessageId() == null)
-                || "".equals(clientOptions.getMessageId()))
-                ? UUIDGenerator.getUUID()
-                : clientOptions.getMessageId());
-        msgCtx.setWSAAction(clientOptions.getAction());
-        msgCtx.setSoapAction(clientOptions.getSoapAction());
-        msgCtx.setProperty(Constants.Configuration.IS_USING_SEPARATE_LISTENER,
-                Boolean.valueOf(clientOptions.isUseSeparateListener()));
-
-        // we are not setting the properties here. Those will be set, when we
-        // create the operation context
-    }
-
     /**
      * Infers the transport by looking at the URL. The URL can be http:// tcp:/
      * mail:// local://.
@@ -332,8 +310,12 @@
 
         // now its the time to put the parameters set by the user in to the
         // correct places and to the
-        // operation context.
-        extractPropertiesFromOptionsToContexts(msgCtx);
+        // if there is no message id still, set a new one.
+        String messageId = clientOptions.getMessageId();
+        if (messageId == null || "".equals(messageId)) {
+            clientOptions.setMessageId(UUIDGenerator.getUUID());
+        }
+        msgCtx.setOptions(clientOptions);
 
         // check user has put any SOAPHeader using the call MEPClient methods
         // and add them, if any, to the

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java Thu Dec 22 01:59:45 2005
@@ -8,10 +8,12 @@
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.i18n.Messages;
+import org.apache.axis2.om.OMElement;
 import org.apache.axis2.soap.SOAP11Constants;
 import org.apache.axis2.transport.TransportListener;
 
 import javax.xml.namespace.QName;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -40,28 +42,30 @@
 
     public static final String COPY_PROPERTIES = "CopyProperties";
     public static final int DEFAULT_TIMEOUT_MILLISECONDS = 5000;
-    private Options delegate = null;
+    private Options parent;
     private Map properties = new HashMap();
 
     // ==========================================================================
     // Parameters that can be set via Options
     // ==========================================================================
-    private String soapVersionURI = SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI;
+    private String soapVersionURI; // defaults to SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI;
     private String soapAction;
-    private boolean isExceptionToBeThrownOnSOAPFault = true;
-    private long timeOutInMilliSeconds = DEFAULT_TIMEOUT_MILLISECONDS;
-    private boolean useSeparateListener = false;
+    private Boolean isExceptionToBeThrownOnSOAPFault; // defaults to true;
+    private long timeOutInMilliSeconds = -1; // = DEFAULT_TIMEOUT_MILLISECONDS;
+    private Boolean useSeparateListener;   // defaults to false
 
     // Addressing specific properties
     private String action;
     private EndpointReference faultTo;
     private EndpointReference from;
     private TransportListener listener;
-    private TransportInDescription listenerTransport;
-    private String listenerTransportProtocol;
+    private TransportInDescription transportInDescription;
+    private String transportInProtocol;
     private String messageId;
     private RelatesTo relatesTo;
     private EndpointReference replyTo;
+    private ArrayList referenceParameters;
+
 
     /**
      * This is used for sending and receiving messages.
@@ -77,111 +81,75 @@
     }
 
     /**
-     * Any setting in the delegate always wins.
+     * In normal mode operation, this options will try to fullfil the request from its values. If that
+     * is not possible, this options will request those information from its parent.
      *
-     * @param delegate
+     * @param parent
      */
-    public Options(Options delegate) {
-        this.delegate = delegate;
+    public Options(Options parent) {
+        this.parent = parent;
     }
 
     public String getAction() {
-        if (delegate != null) {
-            String ret = delegate.getAction();
-
-            if (ret != null) {
-                return ret;
-            }
+        if (action == null && parent != null) {
+            action = parent.getAction();
         }
-
         return action;
     }
 
     public EndpointReference getFaultTo() {
-        if (delegate != null) {
-            EndpointReference ret = delegate.getFaultTo();
-
-            if (ret != null) {
-                return ret;
-            }
+        if (faultTo == null && parent != null) {
+            faultTo = parent.getFaultTo();
         }
-
         return faultTo;
     }
 
     public EndpointReference getFrom() {
-        if (delegate != null) {
-            EndpointReference ret = delegate.getFrom();
-
-            if (ret != null) {
-                return ret;
-            }
+        if (from == null && parent != null) {
+            from = parent.getFrom();
         }
-
         return from;
     }
 
     public TransportListener getListener() {
-        if (delegate != null) {
-            TransportListener ret = delegate.getListener();
-
-            if (ret != null) {
-                return ret;
-            }
+        if (listener == null && parent != null) {
+            listener = parent.getListener();
         }
-
         return listener;
     }
 
-    public TransportInDescription getListenerTransport() {
-        if (delegate != null) {
-            TransportInDescription ret = delegate.getListenerTransport();
-
-            if (ret != null) {
-                return ret;
-            }
+    public TransportInDescription getTransportInDescription() {
+        if (transportInDescription == null && parent != null) {
+            transportInDescription = parent.getTransportInDescription();
         }
-
-        return listenerTransport;
+        return transportInDescription;
     }
 
-    public String getListenerTransportProtocol() {
-        if (delegate != null) {
-            String ret = delegate.getListenerTransportProtocol();
-
-            if (ret != null) {
-                return ret;
-            }
+    public String getTransportInProtocol() {
+        if (transportInProtocol == null && parent != null) {
+            transportInProtocol = parent.getTransportInProtocol();
         }
-
-        return listenerTransportProtocol;
+        return transportInProtocol;
     }
 
     public String getMessageId() {
-        if (delegate != null) {
-            String ret = delegate.getMessageId();
-
-            if (ret != null) {
-                return ret;
-            }
+        if (messageId == null && parent != null) {
+            messageId = parent.getMessageId();
         }
 
         return messageId;
     }
 
     public Map getProperties() {
-        if (delegate != null) {
-            Map properties = delegate.getProperties();
+        if (properties.size() == 0 && parent != null) {
+            Map properties = parent.getProperties();
 
             if (properties.size() > 0) {
                 HashMap ret = new HashMap(properties);
-
                 ret.putAll(properties);
-
                 return ret;
             }
         }
-
         return properties;
     }
 
@@ -190,115 +158,82 @@
      * @return the value realeted to this key. Null, if not found.
      */
     public Object getProperty(String key) {
-        if (delegate != null) {
-            Object ret = delegate.getProperty(key);
-
-            if (ret != null) {
-                return ret;
-            }
+        Object myPropValue = properties.get(key);
+        if (myPropValue == null && parent != null) {
+            return parent.getProperty(key);
         }
-
-        return properties.get(key);
+        return myPropValue;
     }
 
     public RelatesTo getRelatesTo() {
-        if (delegate != null) {
-            RelatesTo ret = delegate.getRelatesTo();
-
-            if (ret != null) {
-                return ret;
-            }
+        if (relatesTo == null && parent != null) {
+            relatesTo = parent.getRelatesTo();
         }
-
         return relatesTo;
     }
 
     public EndpointReference getReplyTo() {
-        if (delegate != null) {
-            EndpointReference ret = delegate.getReplyTo();
-
-            if (ret != null) {
-                return ret;
-            }
+        if (replyTo == null && parent != null) {
+            replyTo = parent.getReplyTo();
         }
-
         return replyTo;
     }
 
     public TransportOutDescription getSenderTransport() {
-        if (delegate != null) {
-            TransportOutDescription ret = delegate.getSenderTransport();
-
-            if (ret != null) {
-                return ret;
-            }
+        if (senderTransport == null && parent != null) {
+            senderTransport = parent.getSenderTransport();
         }
 
         return senderTransport;
     }
 
     public String getSenderTransportProtocol() {
-        if (delegate != null) {
-            String ret = delegate.getSenderTransportProtocol();
-
-            if (ret != null) {
-                return ret;
-            }
+        if (senderTransportProtocol == null && parent != null) {
+            senderTransportProtocol = parent.getSenderTransportProtocol();
         }
 
         return senderTransportProtocol;
     }
 
     public String getSoapAction() {
-        if (delegate != null) {
-            String ret = delegate.getSoapAction();
-
-            if (ret != null) {
-                return ret;
-            }
+        if (soapAction == null && parent != null) {
+            soapAction = parent.getSoapAction();
         }
 
-        return (soapAction != null)?soapAction:"";
+        return (soapAction != null) ? soapAction : "";
     }
 
     public String getSoapVersionURI() {
-        if (delegate != null) {
-            String ret = delegate.getSoapVersionURI();
-
-            if (ret != null) {
-                return ret;
-            }
+        if (soapVersionURI == null && parent != null) {
+            soapVersionURI = parent.getSoapVersionURI();
         }
 
-        return soapVersionURI;
+        return soapVersionURI == null ? SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI : soapVersionURI;
     }
 
     /**
      * Gets the wait time after which a client times out in a blocking scenario.
-     * The default is 2000.
+     * The default is Options#DEFAULT_TIMEOUT_MILLISECONDS
      *
      * @return timeOutInMilliSeconds
      */
     public long getTimeOutInMilliSeconds() {
-        if (delegate != null) {
-            return delegate.getTimeOutInMilliSeconds();
+        if (timeOutInMilliSeconds == -1 && parent != null) {
+            timeOutInMilliSeconds = parent.getTimeOutInMilliSeconds();
         }
 
-        return timeOutInMilliSeconds;
+        return timeOutInMilliSeconds == -1 ? DEFAULT_TIMEOUT_MILLISECONDS : timeOutInMilliSeconds;
     }
 
     public EndpointReference getTo() {
-        if (delegate != null) {
-            EndpointReference ret = delegate.getTo();
-
-            if (ret != null) {
-                return ret;
-            }
+        if (to == null && parent != null) {
+            to = parent.getTo();
         }
 
         return to;
     }
 
+
     /**
      * If there is a SOAP Fault in the body of the incoming SOAP Message, system can be configured to
      * throw an exception with the details extracted from the information from the fault message.
@@ -306,19 +241,27 @@
      * be returned to the application, irrespective of whether it has a Fault or not.
      */
     public boolean isExceptionToBeThrownOnSOAPFault() {
-        if (delegate != null) {
-            return delegate.isExceptionToBeThrownOnSOAPFault();
+        if (isExceptionToBeThrownOnSOAPFault == null && parent != null) {
+            isExceptionToBeThrownOnSOAPFault = parent.isExceptionToBeThrownOnSOAPFault;
         }
 
-        return isExceptionToBeThrownOnSOAPFault;
+        return isExceptionToBeThrownOnSOAPFault == null || isExceptionToBeThrownOnSOAPFault.booleanValue();
     }
 
     public boolean isUseSeparateListener() {
-        if (delegate != null) {
-            return delegate.isUseSeparateListener();
+        if (useSeparateListener == null && parent != null) {
+            useSeparateListener = parent.useSeparateListener;
         }
 
-        return useSeparateListener;
+        return useSeparateListener != null && useSeparateListener.booleanValue();
+    }
+
+    public Options getParent() {
+        return parent;
+    }
+
+    public void setParent(Options parent) {
+        this.parent = parent;
     }
 
     public void setAction(String action) {
@@ -334,7 +277,7 @@
      * @param exceptionToBeThrownOnSOAPFault
      */
     public void setExceptionToBeThrownOnSOAPFault(boolean exceptionToBeThrownOnSOAPFault) {
-        isExceptionToBeThrownOnSOAPFault = exceptionToBeThrownOnSOAPFault;
+        isExceptionToBeThrownOnSOAPFault = Boolean.valueOf(exceptionToBeThrownOnSOAPFault);
     }
 
     public void setFaultTo(EndpointReference faultTo) {
@@ -349,12 +292,12 @@
         this.listener = listener;
     }
 
-    public void setListenerTransport(TransportInDescription listenerTransport) {
-        this.listenerTransport = listenerTransport;
+    public void setTransportInDescription(TransportInDescription transportInDescription) {
+        this.transportInDescription = transportInDescription;
     }
 
-    public void setListenerTransportProtocol(String listenerTransportProtocol) {
-        this.listenerTransportProtocol = listenerTransportProtocol;
+    public void setTransportInProtocol(String transportInProtocol) {
+        this.transportInProtocol = transportInProtocol;
     }
 
     public void setMessageId(String messageId) {
@@ -437,7 +380,7 @@
     /**
      * Sets transport information to the call. The senarios supported are as follows:
      * <blockquote><pre>
-     * [senderTransport, listenerTransport, useSeparateListener]
+     * [senderTransport, transportInDescription, useSeparateListener]
      * http, http, true
      * http, http, false
      * http,smtp,true
@@ -449,7 +392,7 @@
      * @param listenerTransport
      * @param useSeparateListener
      * @throws AxisFault
-     * @deprecated Use setListenerTransportProtocol(String) and useSeparateListener(boolean) instead.
+     * @deprecated Use setTransportInProtocol(String) and useSeparateListener(boolean) instead.
      *             You do not need to setSenderTransportProtocol(String) as sender transport can be inferred from the
      *             to EPR. But still you can setSenderTransport(TransportOutDescription).
      */
@@ -471,7 +414,7 @@
             setUseSeparateListener(useSeparateListener);
         }
 
-        setListenerTransportProtocol(listenerTransport);
+        setTransportInProtocol(listenerTransport);
         this.senderTransportProtocol = senderTransport;
     }
 
@@ -484,6 +427,14 @@
      * @param useSeparateListener
      */
     public void setUseSeparateListener(boolean useSeparateListener) {
-        this.useSeparateListener = useSeparateListener;
+        this.useSeparateListener = Boolean.valueOf(useSeparateListener);
+    }
+
+    public void addReferenceParameter(OMElement referenceParameter) {
+        if (referenceParameters == null) {
+            referenceParameters = new ArrayList(5);
+        }
+
+        referenceParameters.add(referenceParameter);
     }
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java Thu Dec 22 01:59:45 2005
@@ -28,6 +28,7 @@
  * This is the top most level of the Context hierachy and is a bag of properties.
  */
 public abstract class AbstractContext {
+
     protected long lastTouchedTime;
 
     protected AbstractContext parent;
@@ -132,4 +133,5 @@
     public long getLastTouchedTime() {
         return lastTouchedTime;
     }
+
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java Thu Dec 22 01:59:45 2005
@@ -18,8 +18,8 @@
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.addressing.MessageInformationHeaders;
 import org.apache.axis2.addressing.RelatesTo;
+import org.apache.axis2.client.Options;
 import org.apache.axis2.description.*;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.soap.SOAP11Constants;
@@ -34,6 +34,8 @@
  */
 public class MessageContext extends AbstractContext {
 
+    protected Options options;
+
     public final static int IN_FLOW = 1;
 
     public final static int OUT_FLOW = 2;
@@ -96,14 +98,6 @@
      */
     private boolean newThreadRequired = false;
 
-    /**
-     * Addressing Information for Axis 2 Following Properties will be kept
-     * inside this, these fields will be initially filled by the transport. Then
-     * later a addressing handler will make relevant changes to this, if
-     * addressing information is present in the SOAP header.
-     */
-    private MessageInformationHeaders messageInformationHeaders = new MessageInformationHeaders();
-
     private boolean isSOAP11 = true;
 
     /**
@@ -154,11 +148,6 @@
      */
     private SOAPEnvelope envelope;
 
-    /**
-     * Field inFaultFlow
-     */
-    private boolean inFaultFlow;
-
     private OperationContext operationContext;
 
     /**
@@ -187,10 +176,6 @@
      */
     private final SessionContext sessionContext;
 
-    private String soapAction;
-
-    private transient TransportInDescription transportIn;
-
     private transient TransportOutDescription transportOut;
 
     public MessageContext() {
@@ -205,7 +190,7 @@
                           TransportInDescription transportIn,
                           TransportOutDescription transportOut) {
         this(configContext, null, transportIn, transportOut);
-        this.transportInName = transportIn.getName();
+        this.options.setTransportInDescription(transportIn);
         this.transportOutname = transportOut.getName();
     }
 
@@ -219,23 +204,22 @@
                           TransportOutDescription transportOut) {
         super(null);
 
+        options = new Options();
+
         if (sessionContext == null) {
             this.sessionContext = new SessionContext(null);
         } else {
             this.sessionContext = sessionContext;
         }
 
-        this.transportIn = transportIn;
+        setTransportIn(transportIn);
         this.transportOut = transportOut;
         this.configurationContext = configContext;
 
-        if (transportIn != null) {
-            this.transportInName = transportIn.getName();
-        }
-
         if (transportOut != null) {
             this.transportOutname = transportOut.getName();
         }
+
     }
 
     /**
@@ -284,26 +268,23 @@
      * @return Returns EndpointReference.
      */
     public EndpointReference getFaultTo() {
-        return messageInformationHeaders.getFaultTo();
+        return options.getFaultTo();
     }
 
     /**
      * @return Returns EndpointReference.
      */
     public EndpointReference getFrom() {
-        return messageInformationHeaders.getFrom();
+        return options.getFrom();
     }
 
     /**
      * @return Returns message id.
      */
     public String getMessageID() {
-        return messageInformationHeaders.getMessageId();
+        return options.getMessageId();
     }
 
-    public MessageInformationHeaders getMessageInformationHeaders() {
-        return messageInformationHeaders;
-    }
 
     /**
      * Retrieves both module specific configuration parameters as well as other
@@ -547,14 +528,14 @@
      * @return Returns RelatesTo.
      */
     public RelatesTo getRelatesTo() {
-        return messageInformationHeaders.getRelatesTo();
+        return options.getRelatesTo();
     }
 
     /**
      * @return Returns EndpointReference.
      */
     public EndpointReference getReplyTo() {
-        return messageInformationHeaders.getReplyTo();
+        return options.getReplyTo();
     }
 
     /**
@@ -590,21 +571,21 @@
      * @return Returns soap action.
      */
     public String getSoapAction() {
-        return soapAction;
+        return options.getSoapAction();
     }
 
     /**
      * @return Returns EndpointReference.
      */
     public EndpointReference getTo() {
-        return messageInformationHeaders.getTo();
+        return options.getTo();
     }
 
     /**
      * @return Returns TransportInDescription.
      */
     public TransportInDescription getTransportIn() {
-        return transportIn;
+        return options.getTransportInDescription();
     }
 
     /**
@@ -615,11 +596,11 @@
     }
 
     public String getWSAAction() {
-        return messageInformationHeaders.getAction();
+        return options.getAction();
     }
 
     public String getWSAMessageId() {
-        return messageInformationHeaders.getMessageId();
+        return options.getMessageId();
     }
 
     /**
@@ -639,13 +620,6 @@
     /**
      * @return Returns boolean.
      */
-    public boolean isInFaultFlow() {
-        return inFaultFlow;
-    }
-
-    /**
-     * @return Returns boolean.
-     */
     public boolean isNewThreadRequired() {
         return newThreadRequired;
     }
@@ -782,28 +756,21 @@
      * @param reference
      */
     public void setFaultTo(EndpointReference reference) {
-        messageInformationHeaders.setFaultTo(reference);
+        options.setFaultTo(reference);
     }
 
     /**
      * @param reference
      */
     public void setFrom(EndpointReference reference) {
-        messageInformationHeaders.setFrom(reference);
-    }
-
-    /**
-     * @param b
-     */
-    public void setInFaultFlow(boolean b) {
-        inFaultFlow = b;
+        options.setFrom(reference);
     }
 
     /**
-     * @param string
+     * @param messageId
      */
-    public void setMessageID(String string) {
-        messageInformationHeaders.setMessageId(string);
+    public void setMessageID(String messageId) {
+        options.setMessageId(messageId);
     }
 
     /**
@@ -848,14 +815,14 @@
      * @param reference
      */
     public void setRelatesTo(RelatesTo reference) {
-        messageInformationHeaders.setRelatesTo(reference);
+        options.setRelatesTo(reference);
     }
 
     /**
      * @param referance
      */
     public void setReplyTo(EndpointReference referance) {
-        messageInformationHeaders.setReplyTo(referance);
+        options.setReplyTo(referance);
     }
 
     /**
@@ -908,27 +875,27 @@
     }
 
     /**
-     * @param string
+     * @param soapAction
      */
-    public void setSoapAction(String string) {
-        soapAction = string;
+    public void setSoapAction(String soapAction) {
+        options.setSoapAction(soapAction);
     }
 
     /**
      * @param referance
      */
     public void setTo(EndpointReference referance) {
-        messageInformationHeaders.setTo(referance);
+        options.setTo(referance);
     }
 
     /**
      * @param in
      */
     public void setTransportIn(TransportInDescription in) {
-        transportIn = in;
+        options.setTransportInDescription(in);
 
         if (in != null) {
-            this.transportInName = in.getName();
+            this.options.setTransportInProtocol(in.getName().getLocalPart());
         }
     }
 
@@ -947,11 +914,11 @@
      * Method getExecutionChain
      */
     public void setWSAAction(String actionURI) {
-        messageInformationHeaders.setAction(actionURI);
+        options.setAction(actionURI);
     }
 
     public void setWSAMessageId(String messageID) {
-        messageInformationHeaders.setMessageId(messageID);
+        options.setMessageId(messageID);
     }
 
     // to get the flow inwhich the execution chain below
@@ -961,5 +928,14 @@
 
     public void setFLOW(int FLOW) {
         this.FLOW = FLOW;
+    }
+
+    public Options getOptions() {
+        return options;
+    }
+
+    public void setOptions(Options options) {
+        this.options = options;
+        this.properties = options.getProperties();
     }
 }

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=358546&r1=358545&r2=358546&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 Thu Dec 22 01:59:45 2005
@@ -27,7 +27,7 @@
     }
 
     public void receive(MessageContext messgeCtx) throws AxisFault {
-        RelatesTo relatesTO = messgeCtx.getMessageInformationHeaders().getRelatesTo();
+        RelatesTo relatesTO = messgeCtx.getOptions().getRelatesTo();
         String messageID = relatesTO.getValue();
         Callback callback = (Callback) callbackStore.get(messageID);
         AsyncResult result = new AsyncResult(messgeCtx);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Thu Dec 22 01:59:45 2005
@@ -20,22 +20,15 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.addressing.MessageInformationHeaders;
+import org.apache.axis2.addressing.RelatesTo;
+import org.apache.axis2.client.Options;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.OperationContext;
 import org.apache.axis2.context.ServiceContext;
 import org.apache.axis2.context.ServiceGroupContext;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.description.Flow;
-import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.description.InOutAxisOperation;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ParameterImpl;
-import org.apache.axis2.description.PhaseRule;
+import org.apache.axis2.description.*;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.MessageReceiver;
@@ -58,23 +51,23 @@
     }
 
     public static MessageContext createOutMessageContext(MessageContext inMessageContext)
-            throws AxisFault {
+            {
         MessageContext newmsgCtx = new MessageContext(inMessageContext.getConfigurationContext(),
                 inMessageContext.getSessionContext(),
                 inMessageContext.getTransportIn(),
                 inMessageContext.getTransportOut());
-        MessageInformationHeaders oldMessageInfoHeaders =
-                inMessageContext.getMessageInformationHeaders();
+        Options oldOptions =
+                inMessageContext.getOptions();
 
         newmsgCtx.setMessageID(UUIDGenerator.getUUID());
-        newmsgCtx.setTo(oldMessageInfoHeaders.getReplyTo());
-        newmsgCtx.setFaultTo(oldMessageInfoHeaders.getFaultTo());
-        newmsgCtx.setFrom(oldMessageInfoHeaders.getTo());
+        newmsgCtx.setTo(oldOptions.getReplyTo());
+        newmsgCtx.setFaultTo(oldOptions.getFaultTo());
+        newmsgCtx.setFrom(oldOptions.getTo());
         newmsgCtx.setRelatesTo(
-                new org.apache.axis2.addressing.RelatesTo(
-                        oldMessageInfoHeaders.getMessageId(),
+                new RelatesTo(
+                        oldOptions.getMessageId(),
                         AddressingConstants.Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE));
-        newmsgCtx.setWSAAction(oldMessageInfoHeaders.getAction());
+        newmsgCtx.setWSAAction(oldOptions.getAction());
         newmsgCtx.setOperationContext(inMessageContext.getOperationContext());
         newmsgCtx.setServiceContext(inMessageContext.getServiceContext());
         newmsgCtx.setProperty(MessageContext.TRANSPORT_OUT,
@@ -119,7 +112,7 @@
 
     public static void extractServiceGroupAndServiceInfo(String filePart,
                                                          MessageContext messageContext)
-            throws AxisFault {
+            {
         String[] values = parseRequestURLForServiceAndOperation(filePart);
         String serviceNameAndGroup = values[0];
 
@@ -152,8 +145,7 @@
 
     public static ServiceContext fillContextInformation(AxisOperation axisOperation,
                                                         AxisService axisService, ConfigurationContext configurationContext)
-            throws AxisFault {
-        MessageContext msgContext;
+            {
 
         // 2. if null, create new opCtxt
         OperationContext operationContext = new OperationContext(axisOperation);
@@ -164,7 +156,7 @@
 
     private static ServiceContext fillServiceContextAndServiceGroupContext(AxisService axisService,
                                                                            ConfigurationContext configurationContext)
-            throws AxisFault {
+            {
         String serviceGroupContextId = UUIDGenerator.getUUID();
         ServiceGroupContext serviceGroupContext = new ServiceGroupContext(configurationContext,
                 axisService.getParent());
@@ -187,7 +179,7 @@
 
         // TODO. This is kind of brittle. Any service with the name /services would cause fun.
         int index = path.lastIndexOf(Constants.REQUEST_URL_PREFIX);
-        String service = null;
+        String service;
 
         if (-1 != index) {
             int serviceStart = index + Constants.REQUEST_URL_PREFIX.length();

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java Thu Dec 22 01:59:45 2005
@@ -19,7 +19,11 @@
 import org.apache.axis2.AbstractTestCase;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.RelatesTo;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.InOutAxisOperation;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.util.UUIDGenerator;
 
@@ -51,7 +55,7 @@
 
         MessageContext messageContext2 = this.getBasicMessageContext();
         messageContext2.setMessageID(UUIDGenerator.getUUID());
-        messageContext2.getMessageInformationHeaders().setRelatesTo(
+        messageContext2.getOptions().setRelatesTo(
                 new RelatesTo(messageContext1.getMessageID()));
         OperationContext operationContext2 = axisOperation
                 .findOperationContext(messageContext2, sessionContext);

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java Thu Dec 22 01:59:45 2005
@@ -57,8 +57,5 @@
 
         msgctx.setReplyTo(null);
         assertNull(msgctx.getReplyTo());
-
-        msgctx.setMessageID(null);
-        assertNull(msgctx.getMessageID());
     }
 }

Modified: webservices/axis2/trunk/java/modules/core/webapp/HappyAxis.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/HappyAxis.jsp?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/HappyAxis.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/HappyAxis.jsp Thu Dec 22 01:59:45 2005
@@ -345,7 +345,7 @@
             Options options = new Options();
             call.setClientOptions(options);
             options.setTo(targetEPR);
-            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
 
             OMElement result =
                     call.invokeBlocking(operationName.getLocalPart(), payload);

Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/GetTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/GetTest.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/GetTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/GetTest.java Thu Dec 22 01:59:45 2005
@@ -55,7 +55,7 @@
 
         Options options = new Options();
         options.setTo(new EndpointReference(epr));
-        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
         options.setProperty(Constants.Configuration.ENABLE_REST, Constants.VALUE_TRUE);
         options.setProperty(Constants.Configuration.ENABLE_REST_THROUGH_GET, Constants.VALUE_TRUE);
 

Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/PostTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/PostTest.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/PostTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/PostTest.java Thu Dec 22 01:59:45 2005
@@ -72,7 +72,7 @@
             Options options = new Options();
             call.setClientOptions(options);
             options.setTo(targetEPR);
-            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
             options.setProperty(Constants.Configuration.ENABLE_REST, Constants.VALUE_TRUE);
             options.setProperty(HTTPConstants.HTTP_CONTENT_TYPE, "application/x-www-form-urlencoded");
 

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=358546&r1=358545&r2=358546&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 Thu Dec 22 01:59:45 2005
@@ -86,7 +86,7 @@
 
         Options options = new Options();
         options.setTo(targetEPR);
-        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
         options.setProperty(Constants.Configuration.ENABLE_REST, Constants.VALUE_TRUE);
 
         call.setClientOptions(options);

Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTGetTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTGetTest.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTGetTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTGetTest.java Thu Dec 22 01:59:45 2005
@@ -46,7 +46,7 @@
         Options options = new Options();
         call.setClientOptions(options);
         options.setTo(new EndpointReference(epr));
-        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
         options.setProperty(Constants.Configuration.ENABLE_REST, Constants.VALUE_TRUE);
         options.setProperty(Constants.Configuration.ENABLE_REST_THROUGH_GET, Constants.VALUE_TRUE);
 

Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java Thu Dec 22 01:59:45 2005
@@ -49,7 +49,7 @@
         options.setTo(targetEPR);
         options.setProperty(Constants.Configuration.ENABLE_MTOM,
                 Constants.VALUE_TRUE);
-        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
         options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
 
         OMElement resultElem = call.invokeBlocking("EchoTestMultiple", BodyElements.bodyMultiple(optimized, repeat));

Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java Thu Dec 22 01:59:45 2005
@@ -46,7 +46,7 @@
         options.setTo(targetEPR);
         options.setProperty(Constants.Configuration.ENABLE_MTOM,
                 Constants.VALUE_TRUE);
-        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
         options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
 
         OMElement resultElem = call.invokeBlocking("EchoTestSingle", BodyElements.bodySingle(optimized));

Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/complex/EchoBlockingClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/complex/EchoBlockingClient.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/complex/EchoBlockingClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/complex/EchoBlockingClient.java Thu Dec 22 01:59:45 2005
@@ -38,7 +38,7 @@
             call.setClientOptions(options);
             options.setTo(targetEPR);
             options.setExceptionToBeThrownOnSOAPFault(false);
-            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
             options.setSoapAction(soapAction);
 
             //Blocking invocation

Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/EchoBlockingClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/EchoBlockingClient.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/EchoBlockingClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/EchoBlockingClient.java Thu Dec 22 01:59:45 2005
@@ -37,7 +37,7 @@
             call.setClientOptions(options);
             options.setTo(targetEPR);
             options.setExceptionToBeThrownOnSOAPFault(false);
-            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
             options.setSoapAction(soapAction);
             //Blocking invocation
 

Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java Thu Dec 22 01:59:45 2005
@@ -51,7 +51,7 @@
         Options options = new Options();
         options.setTo(new EndpointReference(url.toString()));
         options.setSoapAction(soapAction);
-        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
 
         Call call = new Call(clientHome);
         call.setClientOptions(options);

Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java Thu Dec 22 01:59:45 2005
@@ -29,7 +29,6 @@
 import org.apache.axis2.soap.SOAPEnvelope;
 import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
 
-import javax.xml.namespace.QName;
 import java.net.URL;
 
 public class SunRound2Client {
@@ -46,7 +45,7 @@
             Options options = new Options();
             call.setClientOptions(options);
             options.setTo(new EndpointReference(url.toString()));
-            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
             options.setSoapAction(soapAction);
 
             AxisConfiguration axisConfig = new AxisConfiguration();

Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java Thu Dec 22 01:59:45 2005
@@ -29,7 +29,6 @@
 import org.apache.axis2.soap.SOAPEnvelope;
 import test.interop.whitemesa.round3.util.SunRound3ClientUtil;
 
-import javax.xml.namespace.QName;
 import java.net.URL;
 
 public class SunRound3Client {
@@ -47,7 +46,7 @@
             Options options = new Options();
             call.setClientOptions(options);
             options.setTo(new EndpointReference(url.toString()));
-            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
             options.setSoapAction(soapAction);
 
             AxisConfiguration axisConfig = new AxisConfiguration();

Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/complex/EchoBlockingClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/complex/EchoBlockingClient.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/complex/EchoBlockingClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/complex/EchoBlockingClient.java Thu Dec 22 01:59:45 2005
@@ -41,7 +41,7 @@
             call.setClientOptions(options);
             options.setTo(targetEPR);
             options.setExceptionToBeThrownOnSOAPFault(false);
-            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
             options.setSoapAction(soapAction);
 
             //Blocking invocation

Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/simple/EchoBlockingClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/simple/EchoBlockingClient.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/simple/EchoBlockingClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/simple/EchoBlockingClient.java Thu Dec 22 01:59:45 2005
@@ -41,7 +41,7 @@
             call.setClientOptions(options);
             options.setTo(targetEPR);
             options.setExceptionToBeThrownOnSOAPFault(false);
-            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
             options.setSoapAction(soapAction);
             //Blocking invocation
 

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java Thu Dec 22 01:59:45 2005
@@ -71,7 +71,7 @@
 
             Options options = new Options();
             call.setClientOptions(options);
-            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
             options.setTo(targetEPR);
             
             SOAPEnvelope resEnv =

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java Thu Dec 22 01:59:45 2005
@@ -82,7 +82,7 @@
             options.setProperty(MessageContext.CHARACTER_SET_ENCODING, "utf-16");
 
             options.setTo(targetEPR);
-            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
             OMElement resultElem = call.invokeBlocking(operationName.getLocalPart(), payload);
 
 

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=358546&r1=358545&r2=358546&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 Thu Dec 22 01:59:45 2005
@@ -76,7 +76,7 @@
         Options options = new Options();
         call.setClientOptions(options);
         options.setTo(targetEPR);
-        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
 
         Callback callback = new Callback() {
             public void onComplete(AsyncResult result) {
@@ -119,7 +119,7 @@
         Options options = new Options();
         call.setClientOptions(options);
         options.setTo(targetEPR);
-        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
 
         OMElement result =
                 call.invokeBlocking(operationName.getLocalPart(),

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java Thu Dec 22 01:59:45 2005
@@ -3,13 +3,13 @@
 import junit.framework.TestCase;
 import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.transport.http.HttpTransportProperties;
-import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.axis2.client.Options;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.integration.TestingUtils;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.om.OMElement;
+import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.transport.http.HttpTransportProperties;
 import org.apache.axis2.util.Utils;
 
 import javax.xml.namespace.QName;
@@ -86,7 +86,7 @@
         call.setClientOptions(options);
         options.setProperty(HTTPConstants.PROXY, proxyproperties);
         options.setTo(targetEPR);
-        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
 
         OMElement result =
                 call.invokeBlocking(operationName.getLocalPart(),

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunckedTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunckedTest.java?rev=358546&r1=358545&r2=358546&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunckedTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunckedTest.java Thu Dec 22 01:59:45 2005
@@ -117,7 +117,7 @@
         call.setClientOptions(clientOptions);
 
         clientOptions.setTo(targetEPR);
-        clientOptions.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        clientOptions.setTransportInProtocol(Constants.TRANSPORT_HTTP);
 
         OMElement result =
                 call.invokeBlocking(operationName.getLocalPart(),

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=358546&r1=358545&r2=358546&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 Thu Dec 22 01:59:45 2005
@@ -119,7 +119,7 @@
         Options options = new Options();
         call.setClientOptions(options);
         options.setTo(targetEPR);
-        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
 
         OMElement result =
                 call.invokeBlocking(operationName.getLocalPart(),



Mime
View raw message