Return-Path: Delivered-To: apmail-xml-axis-dev-archive@xml.apache.org Received: (qmail 23311 invoked by uid 500); 18 Oct 2001 15:32:14 -0000 Mailing-List: contact axis-dev-help@xml.apache.org; run by ezmlm Precedence: bulk Reply-To: axis-dev@xml.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list axis-dev@xml.apache.org Received: (qmail 23295 invoked by uid 500); 18 Oct 2001 15:32:14 -0000 Delivered-To: apmail-xml-axis-cvs@apache.org Date: 18 Oct 2001 15:25:50 -0000 Message-ID: <20011018152550.36229.qmail@icarus.apache.org> From: gdaniels@apache.org To: xml-axis-cvs@apache.org Subject: cvs commit: xml-axis/java/test/functional FunctionalTests.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N gdaniels 01/10/18 08:25:50 Modified: java/src/org/apache/axis/client Call.java ServiceClient.java Transport.java java/src/org/apache/axis/transport/http HTTPSender.java HTTPTransport.java java/src/org/apache/axis/transport/local LocalTransport.java java/src/org/apache/axis/utils Options.java java/test/functional FunctionalTests.java Log: Continue migration to Call, fixing problems with Transports. Transport.setupMessageContext() hadn't yet been moved over to using Call objects for the HTTP transport, so things like the session cookies were not getting set correctly during invocations. Completely removed ServiceClient version of setupMessageContext(). Replace MessageContext.reset() in Call.invoke(). Revision Changes Path 1.19 +1 -2 xml-axis/java/src/org/apache/axis/client/Call.java Index: Call.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Call.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Call.java 2001/10/18 14:36:55 1.18 +++ Call.java 2001/10/18 15:25:49 1.19 @@ -958,8 +958,7 @@ public void invoke() throws AxisFault { category.debug("Enter: Call::invoke()" ); - // Don't want to reset - this will erase the cookies! - // msgContext.reset(); + msgContext.reset(); if (myProperties != null) { Enumeration enum = myProperties.keys(); 1.57 +2 -1 xml-axis/java/src/org/apache/axis/client/ServiceClient.java Index: ServiceClient.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/ServiceClient.java,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- ServiceClient.java 2001/10/16 13:25:52 1.56 +++ ServiceClient.java 2001/10/18 15:25:49 1.57 @@ -757,7 +757,8 @@ // set up message context if there is a transport if (transport != null) { - transport.setupMessageContext(msgContext, this, this.engine); +// Temporary - this class will soon become a shell for Call + transport.setupMessageContext(msgContext, new Call(), this.engine); } else msgContext.setTransportName( transportName ); 1.13 +0 -36 xml-axis/java/src/org/apache/axis/client/Transport.java Index: Transport.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Transport.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Transport.java 2001/10/11 11:47:12 1.12 +++ Transport.java 2001/10/18 15:25:49 1.13 @@ -77,28 +77,7 @@ */ public String url = null; - /** - * Set up any transport-specific derived properties in the message context. - * @param context the context to set up - * @param message the client service instance - * @param engine the engine containing the registries - * @throws AxisFault if service cannot be found - */ public final void setupMessageContext(MessageContext context, - ServiceClient message, - AxisEngine engine) - throws AxisFault - { - if (url != null) - context.setProperty(MessageContext.TRANS_URL, url); - - if (transportName != null) - context.setTransportName(transportName); - - setupMessageContextImpl(context, message, engine); - } - - public final void setupMessageContext(MessageContext context, Call message, AxisEngine engine) throws AxisFault @@ -110,21 +89,6 @@ context.setTransportName(transportName); setupMessageContextImpl(context, message, engine); - } - - /** - * Set up any transport-specific derived properties in the message context. - * @param context the context to set up - * @param message the client service instance - * @param engine the engine containing the registries - * @throws AxisFault if service cannot be found - */ - public void setupMessageContextImpl(MessageContext context, - ServiceClient message, - AxisEngine engine) - throws AxisFault - { - // Default impl does nothing } public void setupMessageContextImpl(MessageContext context, 1.26 +1 -5 xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java Index: HTTPSender.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- HTTPSender.java 2001/10/18 14:26:39 1.25 +++ HTTPSender.java 2001/10/18 15:25:49 1.26 @@ -95,10 +95,6 @@ targetURL = msgContext.getStrProp( MessageContext.TRANS_URL); - // Clear any values from the previous run - msgContext.clearProperty(HTTPConstants.MC_HTTP_STATUS_CODE); - msgContext.clearProperty(HTTPConstants.MC_HTTP_STATUS_MESSAGE); - try { String host ; int port = 80 ; @@ -358,7 +354,7 @@ statusMessage, null, null); - fault.setFaultDetailsString("rc:" + returnCode + "\n" + + fault.setFaultDetailsString("return code:" + returnCode + "\n"+ new String(buf, 0, len)); throw fault; } 1.9 +2 -2 xml-axis/java/src/org/apache/axis/transport/http/HTTPTransport.java Index: HTTPTransport.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/HTTPTransport.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- HTTPTransport.java 2001/10/03 15:30:07 1.8 +++ HTTPTransport.java 2001/10/18 15:25:49 1.9 @@ -58,8 +58,8 @@ import org.apache.axis.AxisEngine; import org.apache.axis.AxisFault; import org.apache.axis.MessageContext; -import org.apache.axis.client.ServiceClient; import org.apache.axis.client.Transport; +import org.apache.axis.client.Call; /** * Extends Transport by implementing the setupMessageContext function to @@ -105,7 +105,7 @@ * @throws AxisFault if service cannot be found */ public void setupMessageContextImpl(MessageContext mc, - ServiceClient serviceClient, + Call call, AxisEngine engine) throws AxisFault { 1.8 +2 -2 xml-axis/java/src/org/apache/axis/transport/local/LocalTransport.java Index: LocalTransport.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/local/LocalTransport.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- LocalTransport.java 2001/10/03 15:30:07 1.7 +++ LocalTransport.java 2001/10/18 15:25:49 1.8 @@ -57,8 +57,8 @@ import org.apache.axis.AxisEngine; import org.apache.axis.MessageContext; -import org.apache.axis.client.ServiceClient; import org.apache.axis.client.Transport; +import org.apache.axis.client.Call; import org.apache.axis.server.AxisServer; /** @@ -110,7 +110,7 @@ * @param engine the engine containing the registries */ public void setupMessageContextImpl(MessageContext mc, - ServiceClient serv, + Call call, AxisEngine engine) { if (server != null) 1.19 +1 -1 xml-axis/java/src/org/apache/axis/utils/Options.java Index: Options.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/Options.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Options.java 2001/10/18 13:42:08 1.18 +++ Options.java 2001/10/18 15:25:50 1.19 @@ -280,7 +280,7 @@ URL url = null ; // Just in case... - org.apache.axis.client.ServiceClient.initialize(); + org.apache.axis.client.Call.initialize(); if ( (tmp = isValueSet( 'l' )) != null ) { url = new URL( tmp ); 1.10 +0 -2 xml-axis/java/test/functional/FunctionalTests.java Index: FunctionalTests.java =================================================================== RCS file: /home/cvs/xml-axis/java/test/functional/FunctionalTests.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- FunctionalTests.java 2001/10/18 14:26:39 1.9 +++ FunctionalTests.java 2001/10/18 15:25:50 1.10 @@ -37,10 +37,8 @@ // bid-buy test suite.addTestSuite(TestBidBuySample.class); - /* Removed since it tests Sessions which SimpleAxisServer doesn't do // address book test suite.addTestSuite(TestAddressBookSample.class); - */ // "Raw" echo service test. suite.addTestSuite(TestMiscSample.class);