axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r366109 - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/client/ core/src/org/apache/axis2/context/ core/src/org/apache/axis2/description/ integration/test/org/apache/axis2/engine/
Date Thu, 05 Jan 2006 07:28:08 GMT
Author: deepal
Date: Wed Jan  4 23:27:49 2006
New Revision: 366109

URL: http://svn.apache.org/viewcvs?rev=366109&view=rev
Log:
small refactoring (senderTranport to TranportOut)

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOnlyMEPClient.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/client/ServiceClient.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOnlyMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOnlyMEPClient.java?rev=366109&r1=366108&r2=366109&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOnlyMEPClient.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOnlyMEPClient.java
Wed Jan  4 23:27:49 2006
@@ -59,7 +59,7 @@
         msgctx.setServiceContext(serviceContext);
 
         // if the transport to use for sending is not specified, try to find it from the
URL
-        TransportOutDescription senderTransport = clientOptions.getSenderTransport();
+        TransportOutDescription senderTransport = clientOptions.getTranportOut();
 
         if (senderTransport == null) {
             senderTransport = inferTransport(msgctx.getTo());

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=366109&r1=366108&r2=366109&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
Wed Jan  4 23:27:49 2006
@@ -90,24 +90,24 @@
      * @throws AxisFault
      */
     private void checkTransport(MessageContext msgctx) throws AxisFault {
-        if (clientOptions.getSenderTransport() == null) {
-            clientOptions.setSenderTransport(inferTransport(msgctx.getTo()));
+        if (clientOptions.getTranportOut() == null) {
+            clientOptions.setTranportOut(inferTransport(msgctx.getTo()));
         }
 
         if (clientOptions.isUseSeparateListener()) {
-            if (clientOptions.getTransportInDescription() == null) {
-                clientOptions.setTransportInDescription(
+            if (clientOptions.getTransportIn() == null) {
+                clientOptions.setTransportIn(
                         serviceContext.getConfigurationContext().getAxisConfiguration().getTransportIn(
-                                clientOptions.getSenderTransport().getName()));
+                                clientOptions.getTranportOut().getName()));
             }
         }
 
         if (msgctx.getTransportIn() == null) {
-            msgctx.setTransportIn(clientOptions.getTransportInDescription());
+            msgctx.setTransportIn(clientOptions.getTransportIn());
         }
 
         if (msgctx.getTransportOut() == null) {
-            msgctx.setTransportOut(clientOptions.getSenderTransport());
+            msgctx.setTransportOut(clientOptions.getTranportOut());
         }
     }
 
@@ -118,7 +118,7 @@
     public void close() throws AxisFault {
         if (clientOptions.isUseSeparateListener()) {
             ListenerManager.stop(serviceContext.getConfigurationContext(),
-                    clientOptions.getTransportInDescription().getName().getLocalPart());
+                    clientOptions.getTransportIn().getName().getLocalPart());
         }
     }
 
@@ -138,7 +138,7 @@
                                 listenerTransportProtocol));
                     }
 
-                    clientOptions.setTransportInDescription(transportIn);
+                    clientOptions.setTransportIn(transportIn);
                 }
             }
 
@@ -245,7 +245,7 @@
             operationContext.setProperties(clientOptions.getProperties());
 
             // Send the SOAP Message and receive a response
-            MessageContext response = send(msgctx, clientOptions.getTransportInDescription());
+            MessageContext response = send(msgctx, clientOptions.getTransportIn());
 
             // check for a fault and return the result
             SOAPEnvelope resenvelope = response.getEnvelope();
@@ -323,7 +323,7 @@
                                 .replyToEPR(serviceContext.getConfigurationContext(),
                                         serviceContext.getAxisService().getName() + "/"
                                                 + axisop.getName().getLocalPart(), clientOptions
-                                        .getTransportInDescription().getName().getLocalPart());
+                                        .getTransportIn().getName().getLocalPart());
 
                 if (msgctx.getReplyTo() == null) {
                     msgctx.setReplyTo(replyToFromTransport);
@@ -420,7 +420,7 @@
             try {
 
                 // send the request and wait for reponse
-                MessageContext response = send(msgctx, clientOptions.getTransportInDescription());
+                MessageContext response = send(msgctx, clientOptions.getTransportIn());
 
                 // 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=366109&r1=366108&r2=366109&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 Wed
Jan  4 23:27:49 2006
@@ -258,7 +258,7 @@
         // user can set the transport by giving a TransportOutDescription or we
         // will deduce that from the "to" epr information, if user has not set the
         // TransportOutDescription, lets infer that
-        if (clientOptions.getSenderTransport() == null) {
+        if (clientOptions.getTranportOut() == null) {
             AxisConfiguration axisConfig =
                     this.serviceContext.getConfigurationContext().getAxisConfiguration();
 
@@ -271,17 +271,17 @@
 
                     // by this time we have passed all the information we
                     // collected via Options to the message context
-                    clientOptions.setSenderTransport(inferTransport(msgCtx.getTo()));
+                    clientOptions.setTranportOut(inferTransport(msgCtx.getTo()));
                 } else {
 
                     // if he has not set the transport information, we gonna
                     // infer that from the to EPR
-                    clientOptions.setSenderTransport(
+                    clientOptions.setTranportOut(
                             axisConfig.getTransportOut(new QName(senderTrasportProtocol)));
                 }
             }
 
-            if (this.clientOptions.getSenderTransport() == null) {
+            if (this.clientOptions.getTranportOut() == null) {
                 throw new AxisFault(Messages.getMessage("unknownTransport",
                                                         senderTrasportProtocol));
             }

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=366109&r1=366108&r2=366109&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 Wed
Jan  4 23:27:49 2006
@@ -53,19 +53,17 @@
     // Parameters that can be set via Options
     // ==========================================================================
     private String soapVersionURI; // defaults to
-                                    // SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI;
+    // SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI;
 
     private String soapAction;
 
     private Boolean isExceptionToBeThrownOnSOAPFault; // defaults to true;
 
     private long timeOutInMilliSeconds = -1; // =
-                                                // DEFAULT_TIMEOUT_MILLISECONDS;
+    // DEFAULT_TIMEOUT_MILLISECONDS;
 
     private Boolean useSeparateListener; // defaults to false
 
-    private String soapFactory;
-
     // Addressing specific properties
     private String action;
 
@@ -75,7 +73,7 @@
 
     private TransportListener listener;
 
-    private TransportInDescription transportInDescription;
+    private TransportInDescription transportIn;
 
     private String transportInProtocol;
 
@@ -90,7 +88,7 @@
     /**
      * This is used for sending and receiving messages.
      */
-    protected TransportOutDescription senderTransport;
+    protected TransportOutDescription transportOut;
 
     private String senderTransportProtocol;
 
@@ -106,7 +104,7 @@
      * 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 parent
      */
     public Options(Options parent) {
@@ -141,11 +139,11 @@
         return listener;
     }
 
-    public TransportInDescription getTransportInDescription() {
-        if (transportInDescription == null && parent != null) {
-            transportInDescription = parent.getTransportInDescription();
+    public TransportInDescription getTransportIn() {
+        if (transportIn == null && parent != null) {
+            transportIn = parent.getTransportIn();
         }
-        return transportInDescription;
+        return transportIn;
     }
 
     public String getTransportInProtocol() {
@@ -202,12 +200,12 @@
         return replyTo;
     }
 
-    public TransportOutDescription getSenderTransport() {
-        if (senderTransport == null && parent != null) {
-            senderTransport = parent.getSenderTransport();
+    public TransportOutDescription getTranportOut() {
+        if (transportOut == null && parent != null) {
+            transportOut = parent.getTranportOut();
         }
 
-        return senderTransport;
+        return transportOut;
     }
 
     public String getSenderTransportProtocol() {
@@ -238,7 +236,7 @@
     /**
      * Gets the wait time after which a client times out in a blocking scenario.
      * The default is Options#DEFAULT_TIMEOUT_MILLISECONDS
-     * 
+     *
      * @return timeOutInMilliSeconds
      */
     public long getTimeOutInMilliSeconds() {
@@ -303,7 +301,7 @@
      * that facility. If this is false, the response message will just be
      * returned to the application, irrespective of whether it has a Fault or
      * not.
-     * 
+     *
      * @param exceptionToBeThrownOnSOAPFault
      */
     public void setExceptionToBeThrownOnSOAPFault(
@@ -324,9 +322,8 @@
         this.listener = listener;
     }
 
-    public void setTransportInDescription(
-            TransportInDescription transportInDescription) {
-        this.transportInDescription = transportInDescription;
+    public void setTransportIn(TransportInDescription transportIn) {
+        this.transportIn = transportIn;
     }
 
     public void setTransportInProtocol(String transportInProtocol) {
@@ -344,7 +341,7 @@
      * (org.apache.axis2.client.Options#COPY_PROPERTIES) so that if set to
      * Boolean(true), this code will copy the whole thing, without just
      * referencing to the source.
-     * 
+     *
      * @param properties
      */
     public void setProperties(Map properties) {
@@ -356,7 +353,7 @@
      * this. If there is a method to the set this property, within this class,
      * its encouraged to use that method, without duplicating stuff or making
      * room for bugs.
-     * 
+     *
      * @param propertyKey
      * @param property
      */
@@ -372,20 +369,19 @@
         this.replyTo = replyTo;
     }
 
-    public void setSenderTransport(TransportOutDescription senderTransport) {
-        this.senderTransport = senderTransport;
+    public void setTranportOut(TransportOutDescription transportOut) {
+        this.transportOut = transportOut;
     }
 
     /**
      * Sets the transport to be used for sending the SOAP Message
-     * 
+     *
      * @param senderTransport
-     * @throws AxisFault
-     *             if the transport is not found
+     * @throws AxisFault if the transport is not found
      */
     public void setSenderTransport(String senderTransport,
-            AxisConfiguration axisConfiguration) throws AxisFault {
-        this.senderTransport = axisConfiguration.getTransportOut(new QName(
+                                   AxisConfiguration axisConfiguration) throws AxisFault
{
+        this.transportOut = axisConfiguration.getTransportOut(new QName(
                 senderTransport));
 
         if (senderTransport == null) {
@@ -406,7 +402,7 @@
      * This is used in blocking scenario. Client will time out after waiting
      * this amount of time. The default is 2000 and must be provided in
      * multiples of 100.
-     * 
+     *
      * @param timeOutInMilliSeconds
      */
     public void setTimeOutInMilliSeconds(long timeOutInMilliSeconds) {
@@ -420,18 +416,18 @@
     /**
      * Sets transport information to the call. The senarios supported are as
      * follows: <blockquote>
-     * 
+     * <p/>
      * <pre>
-     *  [senderTransport, transportInDescription, useSeparateListener]
+     *  [transportOut, transportIn, useSeparateListener]
      *  http, http, true
      *  http, http, false
      *  http,smtp,true
      *  smtp,http,true
      *  smtp,smtp,true
      * </pre>
-     * 
+     * <p/>
      * </blockquote>
-     * 
+     *
      * @param senderTransport
      * @param listenerTransport
      * @param useSeparateListener
@@ -440,10 +436,10 @@
      *             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).
+     *             setTranportOut(TransportOutDescription).
      */
     public void setTransportInfo(String senderTransport,
-            String listenerTransport, boolean useSeparateListener)
+                                 String listenerTransport, boolean useSeparateListener)
             throws AxisFault {
 
         // here we check for a legal combination, for and example if the
@@ -474,7 +470,7 @@
      * the transport specified. For e.g., if the transports are different this
      * is true by default. HTTP transport supports both cases while SMTP
      * transport supports only two channel case.
-     * 
+     *
      * @param useSeparateListener
      */
     public void setUseSeparateListener(boolean useSeparateListener) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java?rev=366109&r1=366108&r2=366109&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
Wed Jan  4 23:27:49 2006
@@ -468,7 +468,7 @@
     public void finalizeInvoke() throws AxisFault {
         if (options.isUseSeparateListener()) {
             ListenerManager.stop(serviceContext.getConfigurationContext(),
-                    options.getTransportInDescription().getName()
+                    options.getTransportIn().getName()
                             .getLocalPart());
         }
     }

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=366109&r1=366108&r2=366109&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
Wed Jan  4 23:27:49 2006
@@ -198,7 +198,7 @@
             TransportInDescription transportIn,
             TransportOutDescription transportOut) {
         this(configContext, null, transportIn, transportOut);
-        this.options.setTransportInDescription(transportIn);
+        this.options.setTransportIn(transportIn);
         this.transportOutname = transportOut.getName();
     }
 
@@ -593,7 +593,7 @@
      * @return Returns TransportInDescription.
      */
     public TransportInDescription getTransportIn() {
-        return options.getTransportInDescription();
+        return options.getTransportIn();
     }
 
     /**
@@ -900,7 +900,7 @@
      * @param in
      */
     public void setTransportIn(TransportInDescription in) {
-        options.setTransportInDescription(in);
+        options.setTransportIn(in);
 
         if (in != null) {
             this.options.setTransportInProtocol(in.getName().getLocalPart());

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java?rev=366109&r1=366108&r2=366109&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java
Wed Jan  4 23:27:49 2006
@@ -44,7 +44,7 @@
                     throw new AxisFault(Messages.getMessage("unknownTransport",
                             listenerTransportProtocol));
                 }
-                options.setTransportInDescription(transportIn);
+                options.setTransportIn(transportIn);
             }
             // if separate transport is used, start the required listeners
             if (!ac.isEngaged(new QName(Constants.MODULE_ADDRESSING))) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java?rev=366109&r1=366108&r2=366109&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
Wed Jan  4 23:27:49 2006
@@ -36,7 +36,7 @@
     }
 
     public void addMessageContext(MessageContext msgContext,
-            OperationContext opContext) throws AxisFault {
+                                  OperationContext opContext) throws AxisFault {
         HashMap mep = opContext.getMessageContexts();
         MessageContext immsgContext = (MessageContext) mep
                 .get(MESSAGE_LABEL_IN_VALUE);
@@ -61,14 +61,12 @@
      * interact with a server which is offering an In-Out operation. To use the
      * client, you must call addMessageContext() with a message context and then
      * call execute() to execute the client.
-     * 
-     * @param sc
-     *            The service context for this client to live within. Cannot be
-     *            null.
-     * @param options
-     *            Options to use as defaults for this client. If any options are
-     *            set specifically on the client then those override options
-     *            here.
+     *
+     * @param sc      The service context for this client to live within. Cannot be
+     *                null.
+     * @param options Options to use as defaults for this client. If any options are
+     *                set specifically on the client then those override options
+     *                here.
      */
     public OperationClient createClient(ServiceContext sc, Options options) {
         return new OutInAxisOperationClient(this, sc, options);
@@ -97,7 +95,7 @@
     boolean completed;
 
     OutInAxisOperationClient(OutInAxisOperation axisOp, ServiceContext sc,
-            Options options) {
+                             Options options) {
         this.axisOp = axisOp;
         this.sc = sc;
         this.options = new Options(options);
@@ -110,9 +108,8 @@
      * Sets the options that should be used for this particular client. This
      * resets the entire set of options to use the new options - so you'd lose
      * any option cascading that may have been set up.
-     * 
-     * @param options
-     *            the options
+     *
+     * @param options the options
      */
     public void setOptions(Options options) {
         this.options = options;
@@ -122,7 +119,7 @@
      * Return the options used by this client. If you want to set a single
      * option, then the right way is to do getOptions() and set specific
      * options.
-     * 
+     *
      * @return the options, which will never be null.
      */
     public Options getOptions() {
@@ -133,7 +130,7 @@
      * Adding message context to operation context , so that it will handle the
      * logic correctly if the OperationContext is null then new one will be
      * created , and oc will become null when some one call reset()
-     * 
+     *
      * @param mc
      * @throws AxisFault
      */
@@ -144,10 +141,10 @@
 
     /**
      * Retun the message context for a given message lebel
-     * 
+     *
      * @param messageLabel :
-     *            label of the message and that can be either "Out" or "In" and
-     *            nothing else
+     *                     label of the message and that can be either "Out" or "In" and
+     *                     nothing else
      * @return
      * @throws AxisFault
      */
@@ -167,13 +164,11 @@
      * MEP, then if the Out message has been set, then executing the client asks
      * it to send the message and get the In message, possibly using a different
      * thread.
-     * 
-     * @param block
-     *            Indicates whether execution should block or return ASAP. What
-     *            block means is of course a function of the specific MEP
-     *            client. IGNORED BY THIS MEP CLIENT.
-     * @throws AxisFault
-     *             if something goes wrong during the execution of the MEP.
+     *
+     * @param block Indicates whether execution should block or return ASAP. What
+     *              block means is of course a function of the specific MEP
+     *              client. IGNORED BY THIS MEP CLIENT.
+     * @throws AxisFault if something goes wrong during the execution of the MEP.
      */
     public void execute(boolean block) throws AxisFault {
         if (completed) {
@@ -197,36 +192,33 @@
 
         // if the transport to use for sending is not specified, try to find it
         // from the URL
-        TransportOutDescription senderTransport = options.getSenderTransport();
-        if (senderTransport == null) {
+        TransportOutDescription transportOut = options.getTranportOut();
+        if (transportOut == null) {
             EndpointReference toEPR = (options.getTo() != null) ? options
                     .getTo() : mc.getTo();
-            senderTransport = ClientUtils.inferOutTransport(cc
+            transportOut = ClientUtils.inferOutTransport(cc
                     .getAxisConfiguration(), toEPR);
         }
-        mc.setTransportOut(senderTransport);
+        mc.setTransportOut(transportOut);
         if (mc.getTransportIn() == null) {
-            TransportInDescription transportInDescription = options
-                    .getTransportInDescription();
-            if (transportInDescription == null) {
+            TransportInDescription transportIn = options.getTransportIn();
+            if (transportIn == null) {
                 mc.setTransportIn(ClientUtils.inferInTransport(cc
                         .getAxisConfiguration(), options, mc
                         .getServiceContext()));
             } else {
-                mc.setTransportIn(transportInDescription);
+                mc.setTransportIn(transportIn);
             }
         }
 
-        if (options.isUseSeparateListener())
-
-        {
+        if (options.isUseSeparateListener()) {
             CallbackReceiver callbackReceiver = (CallbackReceiver) axisOp
                     .getMessageReceiver();
             callbackReceiver.addCallback(mc.getMessageID(), callback);
             EndpointReference replyToFromTransport = ListenerManager
                     .replyToEPR(cc, sc.getAxisService().getName() + "/"
                             + axisOp.getName().getLocalPart(), options
-                            .getTransportInDescription().getName()
+                            .getTransportIn().getName()
                             .getLocalPart());
 
             if (mc.getReplyTo() == null) {
@@ -244,7 +236,7 @@
             if (block) {
                 // Send the SOAP Message and receive a response
                 MessageContext response = send(mc, options
-                        .getTransportInDescription());
+                        .getTransportIn());
                 // check for a fault and return the result
                 SOAPEnvelope resenvelope = response.getEnvelope();
                 if (resenvelope.getBody().hasFault()) {
@@ -264,13 +256,13 @@
 
                             message = (message + "Code =" + soapFault.getCode() == null)
? ""
                                     : (soapFault.getCode().getValue() == null) ? ""
-                                            : soapFault.getCode().getValue()
-                                                    .getText();
+                                    : soapFault.getCode().getValue()
+                                    .getText();
                             message = (message + "Reason ="
                                     + soapFault.getReason() == null) ? ""
                                     : (soapFault.getReason().getSOAPText() == null) ? ""
-                                            : soapFault.getReason()
-                                                    .getSOAPText().getText();
+                                    : soapFault.getReason()
+                                    .getSOAPText().getText();
 
                             throw new AxisFault(message);
                         }
@@ -293,7 +285,7 @@
      * @throws AxisFault
      */
     public MessageContext send(MessageContext msgctx,
-            TransportInDescription transportIn) throws AxisFault {
+                               TransportInDescription transportIn) throws AxisFault {
         AxisEngine engine = new AxisEngine(msgctx.getConfigurationContext());
 
         engine.send(msgctx);
@@ -317,7 +309,7 @@
 
         SOAPEnvelope resenvelope = TransportUtils.createSOAPMessage(
                 responseMessageContext, msgctx.getEnvelope().getNamespace()
-                        .getName());
+                .getName());
 
         if (resenvelope != null) {
             responseMessageContext.setEnvelope(resenvelope);
@@ -334,10 +326,9 @@
      * Reset the MEP client to a clean status after the MEP has completed. This
      * is how you can reuse a MEP client. NOTE: this does not reset the options;
      * only the internal state so the client can be used again.
-     * 
-     * @throws AxisFault
-     *             if reset is called before the MEP client has completed an
-     *             interaction.
+     *
+     * @throws AxisFault if reset is called before the MEP client has completed an
+     *                   interaction.
      */
     public void reset() throws AxisFault {
         if (!completed) {
@@ -357,7 +348,7 @@
         private MessageContext msgctx;
 
         public NonBlockingInvocationWorker(Callback callback,
-                MessageContext msgctx) {
+                                           MessageContext msgctx) {
             this.callback = callback;
             this.msgctx = msgctx;
         }
@@ -367,7 +358,7 @@
 
                 // send the request and wait for reponse
                 MessageContext response = send(msgctx, options
-                        .getTransportInDescription());
+                        .getTransportIn());
 
                 // call the callback
                 SOAPEnvelope resenvelope = response.getEnvelope();

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java?rev=366109&r1=366108&r2=366109&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java
Wed Jan  4 23:27:49 2006
@@ -249,7 +249,7 @@
 
         // if the transport to use for sending is not specified, try to find it
         // from the URL
-        TransportOutDescription senderTransport = options.getSenderTransport();
+        TransportOutDescription senderTransport = options.getTranportOut();
         if (senderTransport == null) {
             EndpointReference toEPR = (options.getTo() != null) ? options
                     .getTo() : mc.getTo();

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java?rev=366109&r1=366108&r2=366109&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
Wed Jan  4 23:27:49 2006
@@ -103,7 +103,7 @@
         Options options = new Options();
         sender.setOptions(options);
         options.setTo(targetEPR);
-        options.setSenderTransport(tOut);
+        options.setTranportOut(tOut);
         options.setSoapVersionURI(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
         sender.fireAndForget(payload);
 



Mime
View raw message