axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r462643 - in /webservices/axis2/branches/java/1_1/modules: integration/test/org/apache/axis2/addressing/ integration/test/org/apache/axis2/async/ integration/test/org/apache/axis2/deployment/ integration/test/org/apache/axis2/engine/ integr...
Date Tue, 10 Oct 2006 23:58:58 GMT
Author: deepal
Date: Tue Oct 10 16:58:56 2006
New Revision: 462643

URL: http://svn.apache.org/viewvc?view=rev&rev=462643
Log:
remove serviceClient.finalizeInvoke method

Modified:
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/addressing/AddressingServiceTest.java
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/async/AsyncServiceTest.java
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/deployment/TargetResolverServiceTest.java
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
    webservices/axis2/branches/java/1_1/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
    webservices/axis2/branches/java/1_1/modules/samples/src/userguide/clients/EchoBlockingDualClient.java
    webservices/axis2/branches/java/1_1/modules/samples/src/userguide/clients/EchoNonBlockingClient.java
    webservices/axis2/branches/java/1_1/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/addressing/AddressingServiceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/addressing/AddressingServiceTest.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/addressing/AddressingServiceTest.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/addressing/AddressingServiceTest.java
Tue Oct 10 16:58:56 2006
@@ -144,7 +144,7 @@
             }
         } finally {
             if (sender != null)
-                sender.finalizeInvoke();
+                sender.cleanup();
         }
     }
 
@@ -167,7 +167,7 @@
             }
         } finally {
             if (sender != null)
-                sender.finalizeInvoke();
+                sender.cleanup();
         }
     }
 
@@ -224,7 +224,7 @@
             }
         } finally {
             if (sender != null)
-                sender.finalizeInvoke();
+                sender.cleanup();
         }
     }
 

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/async/AsyncServiceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/async/AsyncServiceTest.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/async/AsyncServiceTest.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/async/AsyncServiceTest.java
Tue Oct 10 16:58:56 2006
@@ -137,7 +137,7 @@
             }
         } finally {
             if (sender != null)
-                sender.finalizeInvoke();
+                sender.cleanup();
         }
 
     }

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/deployment/TargetResolverServiceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/deployment/TargetResolverServiceTest.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/deployment/TargetResolverServiceTest.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/deployment/TargetResolverServiceTest.java
Tue Oct 10 16:58:56 2006
@@ -111,7 +111,7 @@
             assertEquals("echoOMElementResponse", result.getLocalName());
         } finally {
             if (sender != null)
-                sender.finalizeInvoke();
+                sender.cleanup();
         }
     }
 

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java
Tue Oct 10 16:58:56 2006
@@ -98,7 +98,7 @@
             assertNotNull("Result value is null", result);
 
             assertEquals("Expected result not received.", expected, result);
-            sender.finalizeInvoke();
+            sender.cleanup();
         } catch (AxisFault e) {
             log.error(e, e);
             assertFalse("Failure in processing", true);

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java
Tue Oct 10 16:58:56 2006
@@ -111,7 +111,7 @@
         }
 //        call.close();
 //
-        sender.finalizeInvoke();
+        sender.cleanup();
         log.info("send the reqest");
     }
 
@@ -128,7 +128,7 @@
         OMElement result = sender.sendReceive(payload);
 
         TestingUtils.campareWithCreatedOMElement(result);
-        sender.finalizeInvoke();
+        sender.cleanup();
 //        call.close();
     }
 

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java
Tue Oct 10 16:58:56 2006
@@ -116,7 +116,8 @@
                 }
             }
         }
-        sender.finalizeInvoke();
+        sender.cleanup();
+        configContext.getListenerManager().stop();
         log.info("send the request");
 
     }
@@ -165,7 +166,8 @@
                 }
             }
         }
-        sender.finalizeInvoke();
+        sender.cleanup();
+        configContext.getListenerManager().stop();
         log.info("send the request");
     }
 
@@ -182,7 +184,8 @@
             OMElement result = sender.sendReceive(payload);
             TestingUtils.campareWithCreatedOMElement(result);
         }
-        sender.finalizeInvoke();
+        sender.cleanup();
+        configContext.getListenerManager().stop();
     }
 
     public void testEchoXMLMultipleDuelSync() throws Exception {
@@ -205,7 +208,8 @@
             OMElement result = sender.sendReceive(payload);
             TestingUtils.campareWithCreatedOMElement(result);
         }
-        sender.finalizeInvoke();
+        sender.cleanup();
+        configContext.getListenerManager().stop();
     }
 
 

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
Tue Oct 10 16:58:56 2006
@@ -88,7 +88,7 @@
         OMElement result = sender.sendReceive(operationName, method);
 
         TestingUtils.campareWithCreatedOMElement(result);
-        sender.finalizeInvoke();
+        sender.cleanup();
 
     }
 
@@ -119,7 +119,7 @@
           OMElement result = sender.sendReceive(operationName, method);
 
           TestingUtils.campareWithCreatedOMElement(result);
-          sender.finalizeInvoke();
+          sender.cleanup();
 
       }
 

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java
Tue Oct 10 16:58:56 2006
@@ -125,7 +125,7 @@
             }
             log.info("send the reqest");
         } finally {
-            sender.finalizeInvoke();
+            sender.cleanup();
         }
 
     }

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
Tue Oct 10 16:58:56 2006
@@ -242,7 +242,7 @@
         assertNotNull(env);
         env.getBody().serialize(StAXUtils.createXMLStreamWriter(
                 System.out));
-        sender.finalizeInvoke();
+        sender.cleanup();
     }
 }
 

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
Tue Oct 10 16:58:56 2006
@@ -144,7 +144,7 @@
                         "Server was shutdown as the async response take too long to complete");
             }
         }
-        sender.finalizeInvoke();
+        sender.cleanup();
     }
 
     public void testEchoXMLSync() throws Exception {
@@ -161,7 +161,7 @@
 
         result.serialize(StAXUtils.createXMLStreamWriter(
                 System.out));
-        sender.finalizeInvoke();
+        sender.cleanup();
     }
 
     public void testEchoXMLCompleteSync() throws Exception {
@@ -185,7 +185,7 @@
 
         result.serialize(StAXUtils.createXMLStreamWriter(
                 System.out));
-        sender.finalizeInvoke();
+        sender.cleanup();
 
     }
 
@@ -228,7 +228,7 @@
         assertNotNull(env);
         env.getBody().serialize(StAXUtils.createXMLStreamWriter(
                 System.out));
-        sender.finalizeInvoke();
+        sender.cleanup();
     }
 
 

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/client/ServiceClient.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
Tue Oct 10 16:58:56 2006
@@ -45,8 +45,10 @@
  */
 public class ServiceClient {
 
-    /** Base name used for a service created without an existing configuration. */
-    public static final String ANON_SERVICE = "annonService";
+    /**
+     * Base name used for a service created without an existing configuration.
+     */
+    public static final String ANON_SERVICE = "anonService";
 
     /**
      * Operation name used for an anonymous out-only operation (meaning we send
@@ -54,7 +56,7 @@
      * In-Only operation).
      */
     public static final QName ANON_OUT_ONLY_OP = new QName(
-            "annonOutonlyOp");
+            "anonOutonlyOp");
 
     /**
      * Operation name used for an anonymous robust-out-only operation
@@ -62,13 +64,13 @@
      * equivalent to a WSDL Robust-In-Only operation).
      */
     public static final QName ANON_ROBUST_OUT_ONLY_OP = new QName(
-            "annonRobustOp");
+            "anonRobustOp");
 
     /**
      * Operation name used for an anonymous in-out operation (meaning we sent a
      * message and receive a response, equivalent to a WSDL In-Out operation).
      */
-    public static final QName ANON_OUT_IN_OP = new QName("annonOutInOp");
+    public static final QName ANON_OUT_IN_OP = new QName("anonOutInOp");
 
     // the meta-data of the service that this client access
     private AxisService axisService;
@@ -103,7 +105,7 @@
      * @param configContext The configuration context under which this service lives (may
      *                      be null, in which case a new local one will be created)
      * @param axisService   The service for which this is the client (may be
-     * <code>null</code>, in which case an anonymous service will be created)
+     *                      <code>null</code>, in which case an anonymous service
will be created)
      * @throws AxisFault if something goes wrong while creating a config context (if
      *                   needed)
      */
@@ -141,7 +143,7 @@
      * We are going to make this policy aware
      *
      * @param configContext
-     * @param wsdl4jDefinition 
+     * @param wsdl4jDefinition
      * @param wsdlServiceName
      * @param portName
      * @throws AxisFault
@@ -265,7 +267,7 @@
      * operation client. Any values set in this configuration will be used for
      * each client, with the standard values for the client still used for any
      * values not set in the override configuration.
-     * 
+     *
      * @param overrideOptions
      */
     public void setOverrideOptions(Options overrideOptions) {
@@ -345,7 +347,7 @@
      *
      * @param headerName
      * @param headerText
-     * @throws AxisFault 
+     * @throws AxisFault
      */
     public void addStringHeader(QName headerName, String headerText) throws AxisFault {
         if (headerName.getNamespaceURI() == null || "".equals(headerName.getNamespaceURI()))
{
@@ -363,10 +365,10 @@
      * more control, you can instead create a client for the operation and use
      * that client to execute the send.
      *
-     * @see #createClient(QName)
      * @param elem XML to send
      * @throws AxisFault if something goes wrong while sending, or if a fault is
      *                   received in response (per the Robust In-Only MEP).
+     * @see #createClient(QName)
      */
     public void sendRobust(OMElement elem) throws AxisFault {
         sendRobust(ANON_ROBUST_OUT_ONLY_OP, elem);
@@ -378,11 +380,11 @@
      * control, you can instead create a client for the operation and use that
      * client to execute the send.
      *
-     * @see #createClient(QName)
      * @param operation name of operation to be invoked (non-<code>null</code>)
      * @param elem      XML to send
      * @throws AxisFault if something goes wrong while sending it or if a fault is
      *                   received in response (per the Robust In-Only MEP).
+     * @see #createClient(QName)
      */
     public void sendRobust(QName operation, OMElement elem) throws AxisFault {
         if (options.isUseSeparateListener()) {
@@ -453,9 +455,9 @@
      * such as "Host not found"). For more control, you can instead create a
      * client for the operation and use that client to execute the send.
      *
-     * @see #createClient(QName)
      * @param elem XML to send
      * @throws AxisFault ff something goes wrong trying to send the XML
+     * @see #createClient(QName)
      */
     public void fireAndForget(OMElement elem) throws AxisFault {
         fireAndForget(ANON_OUT_ONLY_OP, elem);
@@ -468,10 +470,10 @@
      * as "Host not found"). For more control, you can instead create a client
      * for the operation and use that client to execute the send.
      *
-     * @see #createClient(QName)
      * @param operation name of operation to be invoked (non-<code>null</code>)
      * @param elem      XML to send
      * @throws AxisFault if something goes wrong trying to send the XML
+     * @see #createClient(QName)
      */
     public void fireAndForget(QName operation, OMElement elem) throws AxisFault {
         // look up the appropriate axisop and create the client
@@ -491,10 +493,10 @@
      * can instead create a client for the operation and use that client to
      * execute the exchange.
      *
-     * @see #createClient(QName)
      * @param elem
      * @return response
      * @throws AxisFault
+     * @see #createClient(QName)
      */
     public OMElement sendReceive(OMElement elem) throws AxisFault {
         return sendReceive(ANON_OUT_IN_OP, elem);
@@ -580,10 +582,10 @@
      * create a client for the operation and use that client to execute the
      * exchange.
      *
-     * @see #createClient(QName)
      * @param elem
      * @param callback
      * @throws AxisFault
+     * @see #createClient(QName)
      */
     public void sendReceiveNonBlocking(OMElement elem, Callback callback)
             throws AxisFault {
@@ -597,11 +599,11 @@
      * create a client for the operation and use that client to execute the
      * exchange.
      *
-     * @see #createClient(QName)
      * @param operation name of operation to be invoked (non-<code>null</code>)
      * @param elem
      * @param callback
      * @throws AxisFault
+     * @see #createClient(QName)
      */
     public void sendReceiveNonBlocking(QName operation, OMElement elem,
                                        Callback callback) throws AxisFault {
@@ -629,9 +631,9 @@
      * constructed operation client to use the current normal and override
      * options. This method is used internally, and also by generated client
      * stub code.
-     * 
+     *
      * @param operation qualified name of operation (local name is operation
-     *        name, namespace URI is just the empty string)
+     *                  name, namespace URI is just the empty string)
      * @return client configured to talk to the given operation
      * @throws AxisFault if the operation is not found
      */
@@ -655,24 +657,12 @@
     }
 
     /**
-     * Stops the transports and shuts down modules. This should only be called
-     * when you're done using all instances of this class created for a
-     * particular {@link org.apache.axis2.context.ConfigurationContext}, since
-     * all these instances will share a common set of listeners and modules.
-     *
-     * @throws AxisFault
-     */
-    public void finalizeInvoke() throws AxisFault {
-        configContext.getListenerManager().stop();
-    }
-
-    /**
      * Return the SOAP factory to use depending on what options have been set.
      * If the SOAP version has not be seen in the options, version 1.1 is the
      * default.
      *
-     * @see Options#setSoapVersionURI()
      * @return the SOAP factory
+     * @see Options#setSoapVersionURI()
      */
     private SOAPFactory getSOAPFactory() {
         String soapVersionURI = options.getSoapVersionURI();
@@ -706,7 +696,7 @@
 
     /**
      * Add all configured headers to a SOAP envelope.
-     * 
+     *
      * @param envelope
      */
     public void addHeadersToEnvelope(SOAPEnvelope envelope) {
@@ -721,7 +711,7 @@
 
     /**
      * Get the endpoint reference for this client using a particular transport.
-     * 
+     *
      * @param transport transport name (non-<code>null</code>)
      * @return local endpoint
      * @throws AxisFault
@@ -741,7 +731,7 @@
 
     /**
      * Set the endpoint reference for the service.
-     * 
+     *
      * @param targetEpr
      */
     public void setTargetEPR(EndpointReference targetEpr) {
@@ -816,6 +806,9 @@
             if (asg != null) {
                 axisConfiguration.removeServiceGroup(serviceGroupName);
             }
+        } else {
+            //Stopping listeners if you start any
+            configContext.getListenerManager().stop();
         }
     }
 }

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java
Tue Oct 10 16:58:56 2006
@@ -34,6 +34,7 @@
         try {
             saveTCCL(messageCtx);
             invokeBusinessLogic(messageCtx);
+            
         } finally {
             restoreTCCL(messageCtx);
         }

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractInOutSyncMessageReceiver.java
Tue Oct 10 16:58:56 2006
@@ -43,7 +43,7 @@
 
         AxisEngine engine =
                 new AxisEngine(
-                        msgContext.getOperationContext().getServiceContext().getConfigurationContext());
+                        msgContext.getConfigurationContext());
 
         engine.send(outMsgContext);
     }

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
Tue Oct 10 16:58:56 2006
@@ -23,9 +23,6 @@
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
-import org.apache.axis2.util.MultiParentClassLoader;
-import org.apache.axis2.util.JavaUtils;
-import org.apache.axis2.util.Loader;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
 import org.apache.axis2.description.AxisService;
@@ -33,6 +30,8 @@
 import org.apache.axis2.engine.DependencyManager;
 import org.apache.axis2.engine.MessageReceiver;
 import org.apache.axis2.i18n.Messages;
+import org.apache.axis2.util.Loader;
+import org.apache.axis2.util.MultiParentClassLoader;
 
 import java.lang.reflect.Method;
 import java.net.URL;
@@ -45,10 +44,10 @@
 
     protected void saveTCCL(MessageContext msgContext) {
         AxisService service =
-                msgContext.getOperationContext().getServiceContext().getAxisService();
-        if(!init) {
+                msgContext.getAxisService();
+        if (!init) {
             init = true;
-            if(service.getParameter(Constants.SERVICE_TCCL) != null) {
+            if (service.getParameter(Constants.SERVICE_TCCL) != null) {
                 Parameter serviceObjectParam =
                         service.getParameter(Constants.SERVICE_TCCL);
                 serviceTCCL = ((String)
@@ -74,10 +73,10 @@
     }
 
     protected void restoreTCCL(MessageContext msgContext) {
-        if(serviceTCCL != null) {
+        if (serviceTCCL != null) {
             ClassLoader oldTCCL = (ClassLoader) msgContext.getProperty(SAVED_TCCL);
-            if(oldTCCL != null) {
-                if(serviceTCCL.equals(Constants.TCCL_COMPOSITE)) {
+            if (oldTCCL != null) {
+                if (serviceTCCL.equals(Constants.TCCL_COMPOSITE)) {
                     Thread.currentThread().setContextClassLoader(oldTCCL);
                 } else if (serviceTCCL.equals(Constants.TCCL_SERVICE)) {
                     Thread.currentThread().setContextClassLoader(oldTCCL);
@@ -96,7 +95,7 @@
     protected Object makeNewServiceObject(MessageContext msgContext) throws AxisFault {
         try {
             AxisService service =
-                    msgContext.getOperationContext().getServiceContext().getAxisService();
+                    msgContext.getAxisService();
             ClassLoader classLoader = service.getClassLoader();
 
             // allow alternative definition of makeNewServiceObject
@@ -109,9 +108,9 @@
                 // Find static getServiceObject() method, call it if there   
                 Method method = serviceObjectMaker.
                         getMethod("getServiceObject",
-                                  new Class[] { AxisService.class });
+                                new Class[]{AxisService.class});
                 if (method != null)
-                    return method.invoke(serviceObjectMaker.newInstance(), new Object[] {
service });
+                    return method.invoke(serviceObjectMaker.newInstance(), new Object[]{service});
             }
 
             Parameter implInfoParam = service.getParameter(Constants.SERVICE_CLASS);
@@ -148,7 +147,7 @@
      * @throws AxisFault
      */
     protected Object getTheImplementationObject(MessageContext msgContext) throws AxisFault
{
-        ServiceContext serviceContext = msgContext.getOperationContext().getServiceContext();
+        ServiceContext serviceContext = msgContext.getServiceContext();
         Object serviceimpl = serviceContext.getProperty(ServiceContext.SERVICE_OBJECT);
         if (serviceimpl != null) {
             // since service impl is there in service context , take that from there

Modified: webservices/axis2/branches/java/1_1/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
Tue Oct 10 16:58:56 2006
@@ -128,7 +128,7 @@
     public void close() throws SOAPException {
         if (serviceClient != null) {
             try {
-                serviceClient.finalizeInvoke();
+                serviceClient.cleanup();
             } catch (AxisFault axisFault) {
                 throw new SOAPException(axisFault.getMessage());
             }

Modified: webservices/axis2/branches/java/1_1/modules/samples/src/userguide/clients/EchoBlockingDualClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/src/userguide/clients/EchoBlockingDualClient.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/src/userguide/clients/EchoBlockingDualClient.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/samples/src/userguide/clients/EchoBlockingDualClient.java
Tue Oct 10 16:58:56 2006
@@ -66,7 +66,7 @@
             ex.printStackTrace();
         } finally{
             try {
-                sender.finalizeInvoke();
+                sender.cleanup();
             } catch (AxisFault axisFault) {
                 //
             }

Modified: webservices/axis2/branches/java/1_1/modules/samples/src/userguide/clients/EchoNonBlockingClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/src/userguide/clients/EchoNonBlockingClient.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/src/userguide/clients/EchoNonBlockingClient.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/samples/src/userguide/clients/EchoNonBlockingClient.java
Tue Oct 10 16:58:56 2006
@@ -66,7 +66,7 @@
             ex.printStackTrace();
         } finally {
             try {
-                sender.finalizeInvoke();
+                sender.cleanup();
             } catch (AxisFault axisFault) {
                 //
             }

Modified: webservices/axis2/branches/java/1_1/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java?view=diff&rev=462643&r1=462642&r2=462643
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java
Tue Oct 10 16:58:56 2006
@@ -76,7 +76,7 @@
             ex.printStackTrace();
         } finally {
             try {
-                sender.finalizeInvoke();
+                sender.cleanup();
             } catch (AxisFault axisFault) {
                 //have to ignore this
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message