Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 56458 invoked from network); 15 May 2007 11:01:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 May 2007 11:01:52 -0000 Received: (qmail 16554 invoked by uid 500); 15 May 2007 11:01:58 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 16437 invoked by uid 500); 15 May 2007 11:01:57 -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 16426 invoked by uid 500); 15 May 2007 11:01:57 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 16423 invoked by uid 99); 15 May 2007 11:01:57 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 May 2007 04:01:57 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 May 2007 04:01:50 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 46A381A9838; Tue, 15 May 2007 04:01:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r538135 - in /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http: AxisServlet.java server/AxisHttpService.java Date: Tue, 15 May 2007 11:01:29 -0000 To: axis2-cvs@ws.apache.org From: azeez@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070515110130.46A381A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: azeez Date: Tue May 15 04:01:27 2007 New Revision: 538135 URL: http://svn.apache.org/viewvc?view=rev&rev=538135 Log: Getting the HTTP Basic Auth properties from the MessageContext Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java?view=diff&rev=538135&r1=538134&r2=538135 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java Tue May 15 04:01:27 2007 @@ -320,8 +320,7 @@ } else { String status = - (String) msgContext.getOperationContext(). - getProperty(Constants.HTTP_RESPONSE_STATE); + (String) msgContext.getProperty(Constants.HTTP_RESPONSE_STATE); if (status == null) { res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } else { @@ -495,7 +494,7 @@ String contextPath = req.getContextPath(); //handling ROOT scenario, for servlets in the default (root) context, this method returns "" if (contextPath != null && contextPath.length() == 0) { - contextPath = "/"; + contextPath = "/"; } this.contextRoot = contextPath; @@ -711,12 +710,11 @@ } private void setResponseState(MessageContext messageContext, HttpServletResponse response) { - OperationContext opCtx = messageContext.getOperationContext(); - String state = (String) opCtx.getProperty(Constants.HTTP_RESPONSE_STATE); + String state = (String) messageContext.getProperty(Constants.HTTP_RESPONSE_STATE); if (state != null) { int stateInt = Integer.parseInt(state); if (stateInt == HttpServletResponse.SC_UNAUTHORIZED) { // Unauthorized - String realm = (String) opCtx.getProperty(Constants.HTTP_BASIC_AUTH_REALM); + String realm = (String) messageContext.getProperty(Constants.HTTP_BASIC_AUTH_REALM); response.addHeader("WWW-Authenticate", "basic realm=\"" + realm + "\""); } Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java?view=diff&rev=538135&r1=538134&r2=538135 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java Tue May 15 04:01:27 2007 @@ -283,13 +283,13 @@ if (AddressingHelper.isFaultRedirected(msgContext)) { response.setStatus(HttpStatus.SC_ACCEPTED); } else { - OperationContext opCtx = msgContext.getOperationContext(); - String state = (String) opCtx.getProperty(Constants.HTTP_RESPONSE_STATE); + String state = (String) msgContext.getProperty(Constants.HTTP_RESPONSE_STATE); if (state != null) { int stateInt = Integer.parseInt(state); response.setStatus(stateInt); if (stateInt == HttpServletResponse.SC_UNAUTHORIZED) { // Unauthorized - String realm = (String) opCtx.getProperty(Constants.HTTP_BASIC_AUTH_REALM); + String realm = + (String) msgContext.getProperty(Constants.HTTP_BASIC_AUTH_REALM); response.addHeader("WWW-Authenticate", "basic realm=\"" + realm + "\""); } --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org