Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 53774 invoked from network); 12 Oct 2006 16:32:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Oct 2006 16:32:25 -0000 Received: (qmail 61481 invoked by uid 500); 12 Oct 2006 16:32:24 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 61431 invoked by uid 500); 12 Oct 2006 16:32:23 -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 61420 invoked by uid 500); 12 Oct 2006 16:32:23 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 61417 invoked by uid 99); 12 Oct 2006 16:32:23 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Oct 2006 09:32:23 -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-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Oct 2006 09:32:22 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id EF4CD1A981A; Thu, 12 Oct 2006 09:32:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r463307 - in /webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2: deployment/WarBasedAxisConfigurator.java transport/http/AxisServlet.java Date: Thu, 12 Oct 2006 16:32:01 -0000 To: axis2-cvs@ws.apache.org From: dims@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061012163201.EF4CD1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: dims Date: Thu Oct 12 09:32:01 2006 New Revision: 463307 URL: http://svn.apache.org/viewvc?view=rev&rev=463307 Log: possible fix for broken spring support (http://marc.theaimsgroup.com/?t=116053323000002&r=1&w=2) Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java?view=diff&rev=463307&r1=463306&r2=463307 ============================================================================== --- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java (original) +++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java Thu Oct 12 09:32:01 2006 @@ -1,6 +1,8 @@ package org.apache.axis2.deployment; import org.apache.axis2.AxisFault; +import org.apache.axis2.transport.http.HTTPConstants; +import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.description.AxisServiceGroup; import org.apache.axis2.description.Parameter; import org.apache.axis2.engine.AxisConfiguration; @@ -286,5 +288,12 @@ } catch (AxisFault axisFault) { log.info(axisFault); } + } + + public void setConfigContext(ConfigurationContext configContext) { + super.setConfigContext(configContext); + // setting ServletContext into configctx + configContext.setProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT, + config.getServletContext()); } } Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java?view=diff&rev=463307&r1=463306&r2=463307 ============================================================================== --- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java (original) +++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java Thu Oct 12 09:32:01 2006 @@ -312,9 +312,6 @@ axisConfiguration.addParameter(servletConfigParam); ListenerManager listenerManager = new ListenerManager(); listenerManager.init(configContext); - // setting ServletContext into configctx - configContext.setProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT, - servletConfig.getServletContext()); TransportInDescription transportInDescription = new TransportInDescription( new QName(Constants.TRANSPORT_HTTP)); transportInDescription.setReceiver(this); --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org