axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chinth...@apache.org
Subject svn commit: r353972 [1/2] - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/transport/http/ core/webapp/ integration/itest/org/apache/axis2/rest/ integration/itest/test/interop/mtom/ integration/src/test/interop/sun/round4/complex/ ...
Date Mon, 05 Dec 2005 03:51:19 GMT
Author: chinthaka
Date: Sun Dec  4 19:49:59 2005
New Revision: 353972

URL: http://svn.apache.org/viewcvs?rev=353972&view=rev
Log:
- removing the deprecated setTransportInfo from the tests.
- removing redundant parameter, config context, from the method processHTTPPostRequest in HTTPTransportUtils

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.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/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/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/userguide/clients/EchoBlockingWsaBasedClient.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java?rev=353972&r1=353971&r2=353972&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java Sun Dec  4 19:49:59 2005
@@ -183,8 +183,8 @@
                     out,
                     req.getContentType(),
                     req.getHeader(HTTPConstants.HEADER_SOAP_ACTION),
-                    req.getRequestURL().toString(),
-                    configContext);
+                    req.getRequestURL().toString()
+            );
 
             Object contextWritten =
                     msgContext.getOperationContext().getProperty(Constants.RESPONSE_WRITTEN);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?rev=353972&r1=353971&r2=353972&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Sun Dec  4 19:49:59 2005
@@ -60,26 +60,26 @@
 public class HTTPTransportUtils {
 
     public static void processHTTPPostRequest(
-        MessageContext msgContext,
-        InputStream in,
-        OutputStream out,
-        String contentType,
-        String soapActionHeader,
-        String requestURI,
-        ConfigurationContext configurationContext)
-        throws AxisFault {
+            MessageContext msgContext,
+            InputStream in,
+            OutputStream out,
+            String contentType,
+            String soapActionHeader,
+            String requestURI
+    )
+            throws AxisFault {
         boolean soap11 = false;
         try {
 
             //remove the starting and trailing " from the SOAP Action
             if (soapActionHeader != null
-                && soapActionHeader.startsWith("\"")
-                && soapActionHeader.endsWith("\"")) {
+                    && soapActionHeader.startsWith("\"")
+                    && soapActionHeader.endsWith("\"")) {
 
                 soapActionHeader =
-                    soapActionHeader.substring(
-                        1,
-                        soapActionHeader.length() - 1);
+                        soapActionHeader.substring(
+                                1,
+                                soapActionHeader.length() - 1);
             }
             //fill up the Message Contexts
             msgContext.setWSAAction(soapActionHeader);
@@ -92,8 +92,8 @@
             StAXBuilder builder = null;
             if (contentType != null) {
                 if (contentType
-                    .indexOf(HTTPConstants.HEADER_ACCEPT_MULTIPART_RELATED)
-                    > -1) {
+                        .indexOf(HTTPConstants.HEADER_ACCEPT_MULTIPART_RELATED)
+                        > -1) {
                     //It is MTOM
                     builder = selectBuilderForMIME(msgContext, in, contentType);
                     envelope = (SOAPEnvelope) builder.getDocumentElement();
@@ -104,47 +104,47 @@
                     //Figure out the char set encoding and create the reader
 
                     //If charset is not specified
-                    if ( getCharSetEncoding(contentType) == null ) {
+                    if (getCharSetEncoding(contentType) == null) {
                         xmlreader =
-                            XMLInputFactory
-                                .newInstance()
-                                .createXMLStreamReader(
-                                in,
-                                MessageContext.DEFAULT_CHAR_SET_ENCODING);
+                                XMLInputFactory
+                                        .newInstance()
+                                        .createXMLStreamReader(
+                                                in,
+                                                MessageContext.DEFAULT_CHAR_SET_ENCODING);
                         //Set the encoding scheme in the message context
                         msgContext.setProperty(
-                            MessageContext.CHARACTER_SET_ENCODING,
-                            MessageContext.DEFAULT_CHAR_SET_ENCODING);
+                                MessageContext.CHARACTER_SET_ENCODING,
+                                MessageContext.DEFAULT_CHAR_SET_ENCODING);
                     } else {
                         //get the type of char encoding
                         String charSetEnc = getCharSetEncoding(contentType);
                         xmlreader =
-                            XMLInputFactory
-                                .newInstance()
-                                .createXMLStreamReader(
-                                in,
-                                charSetEnc);
+                                XMLInputFactory
+                                        .newInstance()
+                                        .createXMLStreamReader(
+                                                in,
+                                                charSetEnc);
 
                         //Setting the value in msgCtx
                         msgContext.setProperty(
-                            MessageContext.CHARACTER_SET_ENCODING,
-                            charSetEnc);
+                                MessageContext.CHARACTER_SET_ENCODING,
+                                charSetEnc);
 
                     }
                     if (contentType
-                        .indexOf(SOAP12Constants.SOAP_12_CONTENT_TYPE)
-                        > -1) {
+                            .indexOf(SOAP12Constants.SOAP_12_CONTENT_TYPE)
+                            > -1) {
                         soap11 = false;
                         //it is SOAP 1.2
                         builder =
-                            new StAXSOAPModelBuilder(
-                                xmlreader,
-                                SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+                                new StAXSOAPModelBuilder(
+                                        xmlreader,
+                                        SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
                         envelope = (SOAPEnvelope) builder.getDocumentElement();
                     } else if (
-                        contentType.indexOf(
-                            SOAP11Constants.SOAP_11_CONTENT_TYPE)
-                            > -1) {
+                            contentType.indexOf(
+                                    SOAP11Constants.SOAP_11_CONTENT_TYPE)
+                                    > -1) {
                         soap11 = true;
                         //it is SOAP 1.1
 
@@ -154,7 +154,7 @@
                          * Configuration via Deployment
                          */
 
-                        Parameter enable  = msgContext.getParameter(Constants.Configuration.ENABLE_REST);
+                        Parameter enable = msgContext.getParameter(Constants.Configuration.ENABLE_REST);
 
                         if ((soapActionHeader == null
                                 || soapActionHeader.length() == 0)
@@ -174,12 +174,12 @@
                             }
                         } else {
                             builder =
-                                new StAXSOAPModelBuilder(
-                                    xmlreader,
-                                    SOAP11Constants
-                                        .SOAP_ENVELOPE_NAMESPACE_URI);
+                                    new StAXSOAPModelBuilder(
+                                            xmlreader,
+                                            SOAP11Constants
+                                                    .SOAP_ENVELOPE_NAMESPACE_URI);
                             envelope =
-                                (SOAPEnvelope) builder.getDocumentElement();
+                                    (SOAPEnvelope) builder.getDocumentElement();
                         }
                     }
 
@@ -188,13 +188,13 @@
             }
 
             String charsetEncoding = builder.getDocument().getCharsetEncoding();
-            if(charsetEncoding != null && !"".equals(charsetEncoding) &&
-                    !((String)msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING))
-                            .equalsIgnoreCase(charsetEncoding)){
+            if (charsetEncoding != null && !"".equals(charsetEncoding) &&
+                    !((String) msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING))
+                            .equalsIgnoreCase(charsetEncoding)) {
                 String faultCode;
-                if(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(envelope.getNamespace().getName())){
-                   faultCode = SOAP12Constants.FAULT_CODE_SENDER;
-                }else {
+                if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(envelope.getNamespace().getName())) {
+                    faultCode = SOAP12Constants.FAULT_CODE_SENDER;
+                } else {
                     faultCode = SOAP11Constants.FAULT_CODE_SENDER;
                 }
                 throw new AxisFault("Character Set Encoding from " +
@@ -204,7 +204,7 @@
 
 
             msgContext.setEnvelope(envelope);
-            AxisEngine engine = new AxisEngine(configurationContext);
+            AxisEngine engine = new AxisEngine(msgContext.getConfigurationContext());
             if (envelope.getBody().hasFault()) {
                 engine.receiveFault(msgContext);
             } else {
@@ -223,11 +223,11 @@
         } catch (FactoryConfigurationError e) {
             throw new AxisFault(e);
         } catch (UnsupportedEncodingException e) {
-        	throw new AxisFault(e);
+            throw new AxisFault(e);
         } finally {
             if (msgContext.getEnvelope() == null && !soap11) {
                 msgContext.setEnvelope(
-                    new SOAP12Factory().createSOAPEnvelope());
+                        new SOAP12Factory().createSOAPEnvelope());
             }
 
         }
@@ -238,13 +238,14 @@
      * Content-type header
      * Example:
      * Content-Type: text/xml; charset=utf-8
+     *
      * @param contentType
      */
     private static String getCharSetEncoding(String contentType) {
         int index = contentType.indexOf(HTTPConstants.CHAR_SET_ENCODING);
-        if(index == -1) { //Charset encoding not found in the contect-type header
-        	//Using the default UTF-8
-        	return MessageContext.DEFAULT_CHAR_SET_ENCODING;
+        if (index == -1) { //Charset encoding not found in the contect-type header
+            //Using the default UTF-8
+            return MessageContext.DEFAULT_CHAR_SET_ENCODING;
         }
 
         //If there are spaces around the '=' sign
@@ -262,7 +263,7 @@
         //There might be "" around the value - if so remove them
         value = value.replaceAll("\"", "");
 
-        if("null".equalsIgnoreCase(value)){
+        if ("null".equalsIgnoreCase(value)) {
             return null;
         }
 
@@ -271,18 +272,18 @@
     }
 
     public static boolean processHTTPGetRequest(
-        MessageContext msgContext,
-        InputStream in,
-        OutputStream out,
-        String contentType,
-        String soapAction,
-        String requestURI,
-        ConfigurationContext configurationContext,
-        Map requestParameters)
-        throws AxisFault {
+            MessageContext msgContext,
+            InputStream in,
+            OutputStream out,
+            String contentType,
+            String soapAction,
+            String requestURI,
+            ConfigurationContext configurationContext,
+            Map requestParameters)
+            throws AxisFault {
         if (soapAction != null
-            && soapAction.startsWith("\"")
-            && soapAction.endsWith("\"")) {
+                && soapAction.startsWith("\"")
+                && soapAction.endsWith("\"")) {
             soapAction = soapAction.substring(1, soapAction.length() - 1);
         }
         msgContext.setWSAAction(soapAction);
@@ -291,9 +292,9 @@
         msgContext.setProperty(MessageContext.TRANSPORT_OUT, out);
         msgContext.setServerSide(true);
         SOAPEnvelope envelope =
-            HTTPTransportUtils.createEnvelopeFromGetRequest(
-                requestURI,
-                requestParameters);
+                HTTPTransportUtils.createEnvelopeFromGetRequest(
+                        requestURI,
+                        requestParameters);
         if (envelope == null) {
             return false;
         } else {
@@ -306,10 +307,10 @@
     }
 
     public static SOAPEnvelope createEnvelopeFromGetRequest(
-        String requestUrl,
-        Map map) {
+            String requestUrl,
+            Map map) {
         String[] values =
-            Utils.parseRequestURLForServiceAndOperation(requestUrl);
+                Utils.parseRequestURLForServiceAndOperation(requestUrl);
 
         if (values[1] != null && values[0] != null) {
             String operation = values[1];
@@ -317,7 +318,7 @@
             SOAPEnvelope envelope = soapFactory.getDefaultEnvelope();
 
             OMNamespace omNs =
-                soapFactory.createOMNamespace(values[0], "services");
+                    soapFactory.createOMNamespace(values[0], "services");
             OMNamespace defualtNs = new OMNamespaceImpl("", null);
 
             OMElement opElement = soapFactory.createOMElement(operation, omNs);
@@ -339,81 +340,80 @@
     }
 
     public static StAXBuilder selectBuilderForMIME(
-        MessageContext msgContext,
-        InputStream inStream,
-        String contentTypeString)
-        throws OMException,
-			XMLStreamException, FactoryConfigurationError,
-			UnsupportedEncodingException {
+            MessageContext msgContext,
+            InputStream inStream,
+            String contentTypeString)
+            throws OMException,
+            XMLStreamException, FactoryConfigurationError,
+            UnsupportedEncodingException {
         StAXBuilder builder = null;
 
 
         Parameter parameter_cache_attachment = msgContext.getParameter(
                 Constants.Configuration.CACHE_ATTACHMENTS);
-         boolean fileCacheForAttachments ;
-        if(parameter_cache_attachment == null){
+        boolean fileCacheForAttachments;
+        if (parameter_cache_attachment == null) {
             fileCacheForAttachments = false;
-        }  else {
-           fileCacheForAttachments =
-            (Constants
-                .VALUE_TRUE
-                .equals(
-                    parameter_cache_attachment.getValue()));
+        } else {
+            fileCacheForAttachments =
+                    (Constants
+                            .VALUE_TRUE
+                            .equals(
+                            parameter_cache_attachment.getValue()));
         }
         String attachmentRepoDir = null;
         String attachmentSizeThreshold = null;
         Parameter parameter;
         if (fileCacheForAttachments) {
             parameter = msgContext.getParameter(Constants.Configuration.ATTACHMENT_TEMP_DIR);
-            attachmentRepoDir = parameter==null?"":parameter.getValue().toString();
+            attachmentRepoDir = parameter == null ? "" : parameter.getValue().toString();
 
             parameter = msgContext
                     .getParameter(Constants.Configuration.FILE_SIZE_THRESHOLD);
-            attachmentSizeThreshold = parameter==null?"":parameter.getValue().toString();
+            attachmentSizeThreshold = parameter == null ? "" : parameter.getValue().toString();
         }
 
         MIMEHelper mimeHelper = new MIMEHelper(inStream, contentTypeString,
-                fileCacheForAttachments, attachmentRepoDir,attachmentSizeThreshold);
+                fileCacheForAttachments, attachmentRepoDir, attachmentSizeThreshold);
 
         String charSetEncoding = getCharSetEncoding(mimeHelper.getSOAPPartContentType());
         XMLStreamReader reader;
-        if(charSetEncoding == null || "null".equalsIgnoreCase(charSetEncoding)){
-             reader = XMLInputFactory.newInstance()
-                .createXMLStreamReader(
-                        new BufferedReader(new InputStreamReader(mimeHelper
-                                .getSOAPPartInputStream(),
-                                charSetEncoding)));
+        if (charSetEncoding == null || "null".equalsIgnoreCase(charSetEncoding)) {
+            reader = XMLInputFactory.newInstance()
+                    .createXMLStreamReader(
+                            new BufferedReader(new InputStreamReader(mimeHelper
+                                    .getSOAPPartInputStream(),
+                                    charSetEncoding)));
             msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING, charSetEncoding);
 
-        }else {
+        } else {
             reader = XMLInputFactory.newInstance()
-                .createXMLStreamReader(
-                        new BufferedReader(new InputStreamReader(mimeHelper
-                                .getSOAPPartInputStream())));
+                    .createXMLStreamReader(
+                            new BufferedReader(new InputStreamReader(mimeHelper
+                                    .getSOAPPartInputStream())));
             msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING, MessageContext.UTF_8);
 
         }
 
-
         /*
-		 * put a reference to Attachments in to the message context
-		 */
+           * put a reference to Attachments in to the message context
+           */
         msgContext.setProperty(MTOMConstants.ATTACHMENTS, mimeHelper);
         if (mimeHelper.getAttachmentSpecType().equals(MTOMConstants.MTOM_TYPE)) {
             /*
              * Creates the MTOM specific MTOMStAXSOAPModelBuilder
              */
             builder =
-                new MTOMStAXSOAPModelBuilder(
-                    reader,
-                    mimeHelper,
-                    null);
+                    new MTOMStAXSOAPModelBuilder(
+                            reader,
+                            mimeHelper,
+                            null);
         } else if (
-            mimeHelper.getAttachmentSpecType().equals(MTOMConstants.SWA_TYPE)) {
+                mimeHelper.getAttachmentSpecType().equals(MTOMConstants.SWA_TYPE)) {
             builder =
-                new StAXSOAPModelBuilder(
-                    reader,
-                    SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+                    new StAXSOAPModelBuilder(
+                            reader,
+                            SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
         }
         return builder;
     }
@@ -428,7 +428,7 @@
         while (childrenIter.hasNext() && !isOptimized) {
             OMNode node = (OMNode) childrenIter.next();
             if (OMNode.TEXT_NODE == node.getType()
-                && ((OMText) node).isOptimized()) {
+                    && ((OMText) node).isOptimized()) {
                 isOptimized = true;
             } else if (OMNode.ELEMENT_NODE == node.getType()) {
                 isOptimized = isOptimised((OMElement) node);
@@ -440,20 +440,20 @@
     public static boolean doWriteMTOM(MessageContext msgContext) {
         boolean enableMTOM = false;
         if (msgContext.getParameter(Constants.Configuration.ENABLE_MTOM)
-            != null) {
+                != null) {
             enableMTOM =
-                Constants.VALUE_TRUE.equals(
-                    msgContext.getParameter(
-                        Constants.Configuration.ENABLE_MTOM).getValue());
-        } else if(msgContext.getProperty(Constants.Configuration.ENABLE_MTOM) != null) {
+                    Constants.VALUE_TRUE.equals(
+                            msgContext.getParameter(
+                                    Constants.Configuration.ENABLE_MTOM).getValue());
+        } else if (msgContext.getProperty(Constants.Configuration.ENABLE_MTOM) != null) {
             enableMTOM =
-                Constants.VALUE_TRUE.equals(
-                    msgContext.getProperty(
-                        Constants.Configuration.ENABLE_MTOM));
+                    Constants.VALUE_TRUE.equals(
+                            msgContext.getProperty(
+                                    Constants.Configuration.ENABLE_MTOM));
         }
 
         boolean forceMIME = Constants.VALUE_TRUE.equals(msgContext.getProperty(Constants.Configuration.FORCE_MIME));
-        if(forceMIME) return true;
+        if (forceMIME) return true;
 
         boolean envelopeContainsOptimise = HTTPTransportUtils.checkEnvelopeForOptimise(
                 msgContext.getEnvelope());
@@ -462,7 +462,7 @@
 
     public static boolean isDoingREST(MessageContext msgContext) {
         boolean enableREST = false;
-        
+
         // check whether isDoingRest is already true in the message context
         if (msgContext.isDoingREST()) {
             return true;
@@ -470,15 +470,15 @@
 
         Parameter parameter = msgContext.getParameter(Constants.Configuration.ENABLE_REST);
         if (parameter
-            != null) {
+                != null) {
             enableREST =
-                Constants.VALUE_TRUE.equals(
-                    parameter.getValue());
-        } else if(msgContext.getProperty(Constants.Configuration.ENABLE_REST) != null) {
+                    Constants.VALUE_TRUE.equals(
+                            parameter.getValue());
+        } else if (msgContext.getProperty(Constants.Configuration.ENABLE_REST) != null) {
             enableREST =
-                Constants.VALUE_TRUE.equals(
-                    msgContext.getProperty(
-                        Constants.Configuration.ENABLE_REST));
+                    Constants.VALUE_TRUE.equals(
+                            msgContext.getProperty(
+                                    Constants.Configuration.ENABLE_REST));
         }
         msgContext.setDoingREST(enableREST);
         return enableREST;
@@ -489,18 +489,18 @@
         boolean restThroughPost = true;
 
         if (msgContext.getParameter(Constants.Configuration.ENABLE_REST_THROUGH_GET)
-            != null) {
+                != null) {
             restThroughPost =
-                Constants.VALUE_TRUE.equals(
-                    msgContext.getParameter(
-                        Constants.Configuration.ENABLE_REST_THROUGH_GET).getValue());
+                    Constants.VALUE_TRUE.equals(
+                            msgContext.getParameter(
+                                    Constants.Configuration.ENABLE_REST_THROUGH_GET).getValue());
             restThroughPost = false;
-        } else if(msgContext.getProperty(Constants.Configuration.ENABLE_REST_THROUGH_GET) != null) {
+        } else if (msgContext.getProperty(Constants.Configuration.ENABLE_REST_THROUGH_GET) != null) {
             restThroughPost =
-                Constants.VALUE_TRUE.equals(
-                    msgContext.getProperty(
-                        Constants.Configuration.ENABLE_REST_THROUGH_GET));
-            restThroughPost =false;
+                    Constants.VALUE_TRUE.equals(
+                            msgContext.getProperty(
+                                    Constants.Configuration.ENABLE_REST_THROUGH_GET));
+            restThroughPost = false;
         }
         msgContext.setRestThroughPOST(!restThroughPost);
         return restThroughPost;

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java?rev=353972&r1=353971&r2=353972&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java Sun Dec  4 19:49:59 2005
@@ -41,10 +41,10 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.SocketException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.net.SocketException;
 
 public class HTTPWorker implements HttpRequestHandler {
     protected Log log = LogFactory.getLog(getClass().getName());
@@ -148,8 +148,8 @@
                         baos,
                         request.getContentType(),
                         soapAction,
-                        request.getRequestLine().getUri(),
-                        configurationContext);
+                        request.getRequestLine().getUri()
+                );
             }
 
             OperationContext operationContext = msgContext.getOperationContext();

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=353972&r1=353971&r2=353972&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/HappyAxis.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/HappyAxis.jsp Sun Dec  4 19:49:59 2005
@@ -11,18 +11,17 @@
                  javax.servlet.ServletContext,
                  javax.servlet.http.HttpServletRequest,
                  javax.servlet.http.HttpServletResponse,
-                 javax.servlet.jsp.JspWriter,
-                 javax.xml.namespace.QName"
+                 javax.xml.namespace.QName,
+                 javax.xml.parsers.SAXParser"
          session="false" %>
-<%@ page import="javax.xml.parsers.SAXParser" %>
 <%@ page import="javax.xml.parsers.SAXParserFactory" %>
 <%@ page import="javax.xml.stream.XMLOutputFactory" %>
 <%@ page import="javax.xml.stream.XMLStreamException" %>
 <%@ page import="java.io.IOException" %>
-
 <%@ page import="java.io.InputStream" %>
 
-<%@ page import="java.io.StringWriter"%>
+<%@ page import="java.io.StringWriter" %>
+
 <%
     /*
     * Copyright 2002,2004 The Apache Software Foundation.
@@ -346,9 +345,8 @@
             Options options = new Options();
             call.setClientOptions(options);
             options.setTo(targetEPR);
-            options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                    Constants.TRANSPORT_HTTP,
-                    false);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(false);
 
             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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -55,7 +55,8 @@
 
         Options options = new Options();
         options.setTo(new EndpointReference(epr));
-        options.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
         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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -72,7 +72,8 @@
             Options options = new Options();
             call.setClientOptions(options);
             options.setTo(targetEPR);
-            options.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(false);
             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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -86,9 +86,8 @@
 
         Options options = new Options();
         options.setTo(targetEPR);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP,
-                false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
         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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -21,6 +21,7 @@
 import java.io.ByteArrayInputStream;
 
 //This Sample test Client is written for Yahoo Web Search
+
 public class RESTGetTest extends TestCase implements TestConstants {
 
     public void testRESTGet() throws Exception {
@@ -51,7 +52,8 @@
         Options options = new Options();
         call.setClientOptions(options);
         options.setTo(new EndpointReference(epr));
-        options.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
         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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -49,8 +49,8 @@
         options.setTo(targetEPR);
         options.setProperty(Constants.Configuration.ENABLE_MTOM,
                 Constants.VALUE_TRUE);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP, false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
         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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -46,8 +46,8 @@
         options.setTo(targetEPR);
         options.setProperty(Constants.Configuration.ENABLE_MTOM,
                 Constants.VALUE_TRUE);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP, false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
         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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -26,11 +26,10 @@
 public class EchoBlockingClient {
 
 
+    public OMElement sendMsg(SunGroupHClientUtil util, String soapAction) {
+        OMElement firstchild = null;
 
-     public OMElement sendMsg(SunGroupHClientUtil util,String soapAction){
-        OMElement firstchild=null;
-
-        EndpointReference targetEPR = new EndpointReference("http://soapinterop.java.sun.com:80/round4/grouph/complexrpcenc" );
+        EndpointReference targetEPR = new EndpointReference("http://soapinterop.java.sun.com:80/round4/grouph/complexrpcenc");
         try {
 
 
@@ -39,12 +38,13 @@
             call.setClientOptions(options);
             options.setTo(targetEPR);
             options.setExceptionToBeThrownOnSOAPFault(false);
-            options.setTransportInfo(Constants.TRANSPORT_HTTP,Constants.TRANSPORT_HTTP,false);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(false);
             options.setSoapAction(soapAction);
 
             //Blocking invocation
 
-            firstchild = call.invokeBlocking("",util.getEchoOMElement());
+            firstchild = call.invokeBlocking("", util.getEchoOMElement());
 
         } catch (AxisFault axisFault) {
             axisFault.printStackTrace();
@@ -53,12 +53,6 @@
         return firstchild;
 
     }
-
-
-
-
-
-
 
 
 }

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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -25,23 +25,24 @@
 import test.interop.sun.round4.simple.util.SunGroupHClientUtil;
 
 public class EchoBlockingClient {
-    public OMElement sendMsg(SunGroupHClientUtil util,String soapAction){
-        OMElement firstchild=null;
+    public OMElement sendMsg(SunGroupHClientUtil util, String soapAction) {
+        OMElement firstchild = null;
         EndpointReference targetEPR =
-                new EndpointReference("http://soapinterop.java.sun.com:80/round4/grouph/simplerpcenc" );
+                new EndpointReference("http://soapinterop.java.sun.com:80/round4/grouph/simplerpcenc");
         try {
 
 
             Call call = new Call();
-             Options options = new Options();
-        call.setClientOptions(options);
+            Options options = new Options();
+            call.setClientOptions(options);
             options.setTo(targetEPR);
             options.setExceptionToBeThrownOnSOAPFault(false);
-            options.setTransportInfo(Constants.TRANSPORT_HTTP,Constants.TRANSPORT_HTTP,false);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(false);
             options.setSoapAction(soapAction);
             //Blocking invocation
 
-            firstchild = call.invokeBlocking("",util.getEchoOMElement());
+            firstchild = call.invokeBlocking("", util.getEchoOMElement());
 
         } catch (AxisFault axisFault) {
             axisFault.printStackTrace();
@@ -51,10 +52,6 @@
         return firstchild;
 
     }
-
-
-
-
 
 
 }

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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -51,7 +51,8 @@
         Options options = new Options();
         options.setTo(new EndpointReference(url.toString()));
         options.setSoapAction(soapAction);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
 
         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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -46,7 +46,8 @@
             Options options = new Options();
             call.setClientOptions(options);
             options.setTo(new EndpointReference(url.toString()));
-            options.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(false);
             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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -47,7 +47,8 @@
             Options options = new Options();
             call.setClientOptions(options);
             options.setTo(new EndpointReference(url.toString()));
-            options.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(false);
             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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -41,7 +41,8 @@
             call.setClientOptions(options);
             options.setTo(targetEPR);
             options.setExceptionToBeThrownOnSOAPFault(false);
-            options.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(false);
             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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -41,7 +41,8 @@
             call.setClientOptions(options);
             options.setTo(targetEPR);
             options.setExceptionToBeThrownOnSOAPFault(false);
-            options.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(false);
             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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -71,9 +71,8 @@
 
             Options options = new Options();
             call.setClientOptions(options);
-            options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                    Constants.TRANSPORT_HTTP,
-                    false);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(false);
             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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -82,9 +82,8 @@
             options.setProperty(MessageContext.CHARACTER_SET_ENCODING, "utf-16");
 
             options.setTo(targetEPR);
-            options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                    Constants.TRANSPORT_HTTP, false);
-
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(false);
             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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -76,9 +76,8 @@
         Options options = new Options();
         call.setClientOptions(options);
         options.setTo(targetEPR);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP,
-                false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
 
         Callback callback = new Callback() {
             public void onComplete(AsyncResult result) {
@@ -121,9 +120,8 @@
         Options options = new Options();
         call.setClientOptions(options);
         options.setTo(targetEPR);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP,
-                false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
 
         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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -55,7 +55,7 @@
     }
 
     protected void setUp() throws Exception {
-       UtilServer.start(CLIENT_HOME);
+        UtilServer.start(CLIENT_HOME);
         service =
                 Utils.createSimpleService(serviceName,
                         Echo.class.getName(),
@@ -68,7 +68,6 @@
         UtilServer.stop();
     }
 
-
 //    public void testEchoXMLASync() throws Exception {
 //                OMElement payload = createEnvelope();
 //
@@ -118,8 +117,8 @@
         call.setClientOptions(clientOptions);
 
         clientOptions.setTo(targetEPR);
-        clientOptions.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP,
-                false);
+        clientOptions.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        clientOptions.setUseSeparateListener(false);
 
         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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -70,8 +70,6 @@
         UtilServer.stop();
     }
 
-    
-
 //    public void testEchoXMLASync() throws Exception {
 //                OMElement payload = createEnvelope();
 //
@@ -121,9 +119,8 @@
         Options options = new Options();
         call.setClientOptions(options);
         options.setTo(targetEPR);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP,
-                false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
 
         OMElement result =
                 call.invokeBlocking(operationName.getLocalPart(),

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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -84,9 +84,8 @@
             Options options = new Options();
             call.setClientOptions(options);
             options.setTo(targetEPR);
-            options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                    Constants.TRANSPORT_HTTP,
-                    false);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(false);
 
             Callback callback = new Callback() {
                 public void onComplete(AsyncResult result) {
@@ -131,9 +130,8 @@
             Options options = new Options();
             call.setClientOptions(options);
             options.setTo(targetEPR);
-            options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                    Constants.TRANSPORT_HTTP,
-                    true);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(true);
 
             Callback callback = new Callback() {
                 public void onComplete(AsyncResult result) {
@@ -179,9 +177,8 @@
             Options options = new Options();
             call.setClientOptions(options);
             options.setTo(targetEPR);
-            options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                    Constants.TRANSPORT_HTTP,
-                    false);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(false);
 
             OMElement result =
                     call.invokeBlocking(operationName.getLocalPart(),
@@ -190,6 +187,7 @@
             call.close();
         }
     }
+
     public void testEchoXMLMultipleDuelSync() throws Exception {
         SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
 
@@ -202,9 +200,8 @@
             Options options = new Options();
             call.setClientOptions(options);
             options.setTo(targetEPR);
-            options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                    Constants.TRANSPORT_HTTP,
-                    true);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(true);
 
             OMElement result =
                     call.invokeBlocking(operationName.getLocalPart(),
@@ -213,7 +210,6 @@
             call.close();
         }
     }
-
 
 
 }

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java?rev=353972&r1=353971&r2=353972&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java Sun Dec  4 19:49:59 2005
@@ -91,9 +91,8 @@
         call.setClientOptions(options);
         options.setTo(targetEPR);
         call.engageModule(new QName(Constants.MODULE_ADDRESSING));
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP,
-                true);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(true);
         options.setAction(operationName.getLocalPart());
 
         OMElement result = call.invokeBlocking(

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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -97,9 +97,8 @@
         try {
             Options options = new Options();
             options.setTo(targetEPR);
-            options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                    Constants.TRANSPORT_HTTP,
-                    true);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(true);
             options.setAction(operationName.getLocalPart());
             call.setClientOptions(options);
 

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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -86,9 +86,8 @@
         Options options = new Options();
         call.setClientOptions(options);
         options.setTo(targetEPR);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP,
-                false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
 
         Callback callback = new Callback() {
             public void onComplete(AsyncResult result) {
@@ -132,9 +131,8 @@
         Options options = new Options();
         call.setClientOptions(options);
         options.setTo(targetEPR);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP,
-                false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
 
         OMElement result =
                 call.invokeBlocking(operationName.getLocalPart(),
@@ -152,9 +150,8 @@
         Options options = new Options();
         call.setClientOptions(options);
         options.setTo(targetEPR);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP,
-                false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
 
         OMElement result = call.invokeBlocking(
                 operationName.getLocalPart(), payload);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java?rev=353972&r1=353971&r2=353972&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java Sun Dec  4 19:49:59 2005
@@ -111,9 +111,8 @@
         inOutMEPClient.setClientOptions(options);
         options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
         options.setTo(targetEPR);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP,
-                false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
         return inOutMEPClient;
     }
 

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java?rev=353972&r1=353971&r2=353972&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java Sun Dec  4 19:49:59 2005
@@ -24,8 +24,8 @@
 import org.apache.axis2.client.Call;
 import org.apache.axis2.client.Options;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
 import org.apache.axis2.engine.util.TestConstants;
 import org.apache.axis2.handlers.AbstractHandler;
 import org.apache.axis2.integration.UtilServer;
@@ -159,9 +159,8 @@
             String clientHome = "target/test-resources/integrationRepo";
 
             Options options = new Options();
-            options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                    Constants.TRANSPORT_HTTP,
-                    false);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(false);
             options.setTo(targetEPR);
 
             Call call = new Call(clientHome);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java?rev=353972&r1=353971&r2=353972&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java Sun Dec  4 19:49:59 2005
@@ -74,9 +74,8 @@
         options.setSoapVersionURI(
                 SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
         options.setTo(targetEPR);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP,
-                false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
 
         SOAPEnvelope result =
                 inOutMEPClient.invokeBlockingWithEnvelopeOut(
@@ -97,9 +96,8 @@
         options.setSoapVersionURI(
                 SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
         options.setTo(targetEPR);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP,
-                false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
 
         SOAPEnvelope result =
                 inOutMEPClient.invokeBlockingWithEnvelopeOut(
@@ -123,9 +121,8 @@
                 SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
 
         options.setTo(targetEPR);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP,
-                false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
 
         SOAPEnvelope result =
                 inOutMEPClient.invokeBlockingWithEnvelopeOut(

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDispatchingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDispatchingTest.java?rev=353972&r1=353971&r2=353972&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDispatchingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDispatchingTest.java Sun Dec  4 19:49:59 2005
@@ -76,9 +76,9 @@
         call.setClientOptions(options);
         options.setTo(
                 new EndpointReference("http://127.0.0.1:5555/axis/services/EchoXMLService/echoOMElement"));
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP,
-                false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
+        
         OMElement result = call.invokeBlocking(
                 operationName.getLocalPart(), payload);
         TestingUtils.campareWithCreatedOMElement(result);
@@ -99,9 +99,8 @@
         call.setClientOptions(options);
         options.setTo(
                 new EndpointReference("http://127.0.0.1:5555/axis/services/EchoXMLService/"));
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP,
-                false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
         options.setSoapAction("echoOMElement");
         OMElement result = call.invokeBlocking(
                 operationName.getLocalPart(), payload);
@@ -127,9 +126,8 @@
         call.setClientOptions(options);
         options.setTo(
                 new EndpointReference("http://127.0.0.1:5555/axis/services/"));
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP,
-                false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
         OMElement result = call.invokeBlocking(
                 operationName.getLocalPart(), payload);
         TestingUtils.campareWithCreatedOMElement(result);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceGroupContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceGroupContextTest.java?rev=353972&r1=353971&r2=353972&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceGroupContextTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceGroupContextTest.java Sun Dec  4 19:49:59 2005
@@ -85,7 +85,9 @@
         Options options = new Options();
         call.setClientOptions(options);
         options.setTo(targetEPR);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
+        
         options.setAction(operationName.getLocalPart());
 
         SOAPEnvelope result = call.invokeBlocking(operationName.getLocalPart(), payload);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java?rev=353972&r1=353971&r2=353972&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java Sun Dec  4 19:49:59 2005
@@ -55,9 +55,8 @@
 
             Options options = new Options();
             options.setTo(targetEPR);
-            options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                    Constants.TRANSPORT_HTTP,
-                    false);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(false);
             call.setClientOptions(options);
 
             OMElement result =

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java?rev=353972&r1=353971&r2=353972&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java Sun Dec  4 19:49:59 2005
@@ -86,9 +86,8 @@
 
         Options options = new Options();
         options.setTo(targetEPR);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP,
-                false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
         options.setAction(operationName.getLocalPart());
 
         call.setClientOptions(options);

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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -130,8 +130,8 @@
             Options options = new Options();
             call.setClientOptions(options);
             options.setTo(targetEPR);
-            options.setTransportInfo(Constants.TRANSPORT_MAIL,
-                    Constants.TRANSPORT_MAIL, true);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_MAIL);
+            options.setUseSeparateListener(true);
             Callback callback = new Callback() {
                 public void onComplete(AsyncResult result) {
                     resultElem = result.getResponseEnvelope();

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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -51,7 +51,7 @@
 public class MailRequestResponseRawXMLTest extends TestCase {
     private EndpointReference targetEPR =
             new EndpointReference("foo@127.0.0.1" +
-            "/axis/services/EchoXMLService/echoOMElement");
+                    "/axis/services/EchoXMLService/echoOMElement");
     private Log log = LogFactory.getLog(getClass());
     private QName serviceName = new QName("EchoXMLService");
     private QName operationName = new QName("echoOMElement");
@@ -64,7 +64,7 @@
     private SOAPEnvelope envelope;
 
     private boolean finish = false;
-     private ConfigurationContext config;
+    private ConfigurationContext config;
 
     public MailRequestResponseRawXMLTest() {
         super(MailRequestResponseRawXMLTest.class.getName());
@@ -76,7 +76,7 @@
 
     protected void setUp() throws Exception {
         ConfigurationContext configContext = UtilsMailServer.start();
-        
+
         SimpleMailListener ml = new SimpleMailListener();
 
 
@@ -132,9 +132,8 @@
 
         Options options = new Options();
         options.setTo(targetEPR);
-        options.setTransportInfo(Constants.TRANSPORT_MAIL,
-                Constants.TRANSPORT_MAIL,
-                true);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_MAIL);
+        options.setUseSeparateListener(true);
         call.setClientOptions(options);
 
         Callback callback = new Callback() {

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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -53,7 +53,7 @@
 public class MailetRequestResponceRawXMLTest extends TestCase {
     private EndpointReference targetEPR =
             new EndpointReference("axis2-server@127.0.0.1" +
-            "/axis/services/EchoXMLService/echoOMElement");
+                    "/axis/services/EchoXMLService/echoOMElement");
     private Log log = LogFactory.getLog(getClass());
     private QName serviceName = new QName("EchoXMLService");
     private QName operationName = new QName("echoOMElement");
@@ -77,7 +77,7 @@
 
     protected void setUp() throws Exception {
         ConfigurationContext configContext = UtilsMailServer.start();
-        
+
 //        configContext.getAxisConfiguration().engageModule(
 //                new QName(Constants.MODULE_ADDRESSING));
         AxisService service =
@@ -107,7 +107,7 @@
     public void testEchoXMLCompleteASync() throws Exception {
 
         ConfigurationContext configContext = UtilsMailServer.createClientConfigurationContext();
-        
+
         AxisService service = new AxisService(serviceName);
         AxisOperation axisOperation = new OutInAxisOperation(
                 operationName);
@@ -121,23 +121,21 @@
         Utils.resolvePhases(configContext.getAxisConfiguration(), service);
 
 
-
-        ServiceContext serviceContext = Utils.fillContextInformation(axisOperation,  service, configContext);
+        ServiceContext serviceContext = Utils.fillContextInformation(axisOperation, service, configContext);
 
         org.apache.axis2.client.Call call = new org.apache.axis2.client.Call(
                 serviceContext);
         Options options = new Options();
         options.setTo(targetEPR);
-        options.setTransportInfo(Constants.TRANSPORT_MAIL,
-                Constants.TRANSPORT_MAIL,
-                true);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_MAIL);
+        options.setUseSeparateListener(true);
         call.setClientOptions(options);
         Callback callback = new Callback() {
             public void onComplete(AsyncResult result) {
                 try {
                     result.getResponseEnvelope().serializeAndConsume(
-                                    XMLOutputFactory.newInstance()
-                            .createXMLStreamWriter(System.out));
+                            XMLOutputFactory.newInstance()
+                                    .createXMLStreamWriter(System.out));
                 } catch (XMLStreamException e) {
                     reportError(e);
                 } finally {

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java?rev=353972&r1=353971&r2=353972&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java Sun Dec  4 19:49:59 2005
@@ -104,8 +104,9 @@
         call.setClientOptions(options);
         options.setTo(targetEPR);
         options.setProperty(Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP, false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
+        
         options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
         OMElement result = call.invokeBlocking(operationName
                 .getLocalPart(), payload);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java?rev=353972&r1=353971&r2=353972&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java Sun Dec  4 19:49:59 2005
@@ -109,8 +109,8 @@
             options.setTo(targetEPR);
             options.setProperty(Constants.Configuration.ENABLE_MTOM,
                     Constants.VALUE_TRUE);
-            options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                    Constants.TRANSPORT_HTTP, false);
+            options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            options.setUseSeparateListener(false);
             options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
 
             OMElement result = call.invokeBlocking(operationName

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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -56,7 +56,7 @@
     private AxisService service;
 
     private OMTextImpl expectedTextData;
-    
+
     private boolean finish = false;
 
     public EchoRawMTOMTest() {
@@ -77,7 +77,7 @@
     protected void tearDown() throws Exception {
         UtilServer.unDeployService(serviceName);
         UtilServer.stop();
-         UtilServer.unDeployClientService();
+        UtilServer.unDeployClientService();
     }
 
     protected OMElement createEnvelope() throws Exception {
@@ -90,7 +90,7 @@
         Image expectedImage;
         expectedImage =
                 new ImageIO()
-                .loadImage(getResourceAsStream("org/apache/axis2/mtom/test.jpg"));
+                        .loadImage(getResourceAsStream("org/apache/axis2/mtom/test.jpg"));
         ImageDataSource dataSource = new ImageDataSource("test.jpg",
                 expectedImage);
         expectedDH = new DataHandler(dataSource);
@@ -100,26 +100,26 @@
         return rpcWrapEle;
 
     }
+
     public void testEchoXMLASync() throws Exception {
         OMElement payload = createEnvelope();
 
         org.apache.axis2.client.Call call = new org.apache.axis2.client.Call(
-                "target/test-resources/integrationRepo" );
+                "target/test-resources/integrationRepo");
 
         Options options = new Options();
         call.setClientOptions(options);
         options.setTo(targetEPR);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP,
-                false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
 
         Callback callback = new Callback() {
             public void onComplete(AsyncResult result) {
                 SOAPEnvelope envelope = result.getResponseEnvelope();
-                
+
                 OMElement ele = (OMElement) envelope.getBody().getFirstElement().getFirstOMChild();
                 OMText binaryNode = (OMText) ele.getFirstOMChild();
-                
+
                 // to the assert equal
                 compareWithCreatedOMText(binaryNode);
                 finish = true;
@@ -145,7 +145,7 @@
         }
         call.close();
     }
-    
+
     public void testEchoXMLSync() throws Exception {
         SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
 
@@ -158,8 +158,8 @@
         call.setClientOptions(options);
         options.setTo(targetEPR);
         options.setProperty(Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
-        options.setTransportInfo(Constants.TRANSPORT_HTTP,
-                Constants.TRANSPORT_HTTP, false);
+        options.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        options.setUseSeparateListener(false);
         options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
 
         OMElement result = call.invokeBlocking(operationName
@@ -169,13 +169,13 @@
         // OMOutput(XMLOutputFactory.newInstance().createXMLStreamWriter(System.out)));
         OMElement ele = (OMElement) result.getFirstOMChild();
         OMText binaryNode = (OMText) ele.getFirstOMChild();
-        
+
         // to the assert equal
         compareWithCreatedOMText(binaryNode);
-        
+
         // Save the image
         DataHandler actualDH;
-        actualDH = (DataHandler)binaryNode.getDataHandler();
+        actualDH = (DataHandler) binaryNode.getDataHandler();
         Image actualObject = new ImageIO().loadImage(actualDH.getDataSource()
                 .getInputStream());
 //        FileOutputStream imageOutStream = new FileOutputStream("target/testout.jpg");

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=353972&r1=353971&r2=353972&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 Sun Dec  4 19:49:59 2005
@@ -104,8 +104,8 @@
 
         Options clientOptions = new Options();
         clientOptions.setTo(targetEPR);
-        clientOptions.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP,
-                false);
+        clientOptions.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+        clientOptions.setUseSeparateListener(false);
 
         Call call = new Call(clientHome);
         call.setClientOptions(clientOptions);
@@ -152,14 +152,14 @@
             Options clientOptions = new Options();
             clientOptions.setTo(targetEPR);
             clientOptions.setProperty(Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
-            clientOptions.setTransportInfo(Constants.TRANSPORT_HTTP,
-                    Constants.TRANSPORT_HTTP, false);
+            clientOptions.setListenerTransportProtocol(Constants.TRANSPORT_HTTP);
+            clientOptions.setUseSeparateListener(false);
             clientOptions.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
 
             Call call =
-                     new Call(clientHome);
+                    new Call(clientHome);
             call.setClientOptions(clientOptions);
-            
+
             OMElement result = call.invokeBlocking(operationName
                     .getLocalPart(), payload);
 



Mime
View raw message