Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 61888 invoked from network); 9 May 2006 16:07:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 May 2006 16:07:30 -0000 Received: (qmail 74945 invoked by uid 500); 9 May 2006 16:06:53 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 74686 invoked by uid 500); 9 May 2006 16:06:52 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 74675 invoked by uid 500); 9 May 2006 16:06:52 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 74670 invoked by uid 99); 9 May 2006 16:06:52 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 May 2006 09:06:52 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 09 May 2006 09:06:51 -0700 Received: (qmail 61303 invoked by uid 65534); 9 May 2006 16:06:29 -0000 Message-ID: <20060509160629.61302.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r405456 - in /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http: SOAPOverHTTPSender.java util/SOAPUtil.java Date: Tue, 09 May 2006 16:06:29 -0000 To: axis2-cvs@ws.apache.org From: saminda@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: saminda Date: Tue May 9 09:06:27 2006 New Revision: 405456 URL: http://svn.apache.org/viewcvs?rev=405456&view=rev Log: hadling useragent header in server Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/util/SOAPUtil.java Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java?rev=405456&r1=405455&r2=405456&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java Tue May 9 09:06:27 2006 @@ -132,7 +132,7 @@ } private String getUserAgent(MessageContext messageContext) { - String userAgentString = "Axis/2.0"; + String userAgentString = "Axis2"; boolean locked = false; if (messageContext.getParameter(HTTPConstants.USER_AGENT) != null){ OMElement userAgentElement = messageContext.getParameter(HTTPConstants.USER_AGENT).getParameterElement(); Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/util/SOAPUtil.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/util/SOAPUtil.java?rev=405456&r1=405455&r2=405456&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/util/SOAPUtil.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/util/SOAPUtil.java Tue May 9 09:06:27 2006 @@ -20,6 +20,7 @@ import org.apache.axis2.context.MessageContext; import org.apache.axis2.transport.http.HTTPConstants; import org.apache.axis2.transport.http.HTTPTransportUtils; +import org.apache.axiom.om.OMElement; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -47,6 +48,7 @@ HttpServletResponse response) throws AxisFault { try { response.setHeader("Content-Type","text/html"); + response.addHeader(HTTPConstants.HEADER_USER_AGENT, getUserAgent(msgContext)); String soapAction = request.getHeader(HTTPConstants.HEADER_SOAP_ACTION); HTTPTransportUtils.processHTTPPostRequest(msgContext, request.getInputStream(), @@ -61,6 +63,7 @@ response.setContentType("text/xml; charset=" + msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING)); + if ((contextWritten == null) || !Constants.VALUE_TRUE.equals(contextWritten)) { response.setStatus(HttpServletResponse.SC_ACCEPTED); } @@ -68,5 +71,17 @@ } catch (IOException ioException) { throw new AxisFault(ioException); } + } + + private String getUserAgent(MessageContext messageContext) { + String userAgentString = "Axis2"; + if (messageContext.getParameter(HTTPConstants.USER_AGENT) != null){ + OMElement userAgentElement = messageContext.getParameter(HTTPConstants.USER_AGENT).getParameterElement(); + return userAgentElement.getText().trim(); + + } + + + return userAgentString; } }