You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2006/10/12 18:32:01 UTC
svn commit: r463307 - in
/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2:
deployment/WarBasedAxisConfigurator.java transport/http/AxisServlet.java
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