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 sa...@apache.org on 2006/10/12 19:53:56 UTC
svn commit: r463345 - in
/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2:
deployment/WarBasedAxisConfigurator.java transport/http/AxisServlet.java
Author: saminda
Date: Thu Oct 12 10:53:55 2006
New Revision: 463345
URL: http://svn.apache.org/viewvc?view=rev&rev=463345
Log:
Fix to Spring to work in a servlet contaier
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=463345&r1=463344&r2=463345
==============================================================================
--- 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 10:53:55 2006
@@ -295,5 +295,16 @@
// setting ServletContext into configctx
configContext.setProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT,
config.getServletContext());
+ // setting ServletContext into configctx
+ configContext.setProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT,
+ config.getServletContext());
+ Parameter servletConfigParam = new Parameter();
+ servletConfigParam.setName(HTTPConstants.HTTP_SERVLETCONFIG);
+ servletConfigParam.setValue(config);
+ try {
+ configContext.getAxisConfiguration().addParameter(servletConfigParam);
+ } catch (AxisFault axisFault) {
+ log.error(axisFault);
+ }
}
}
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=463345&r1=463344&r2=463345
==============================================================================
--- 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 10:53:55 2006
@@ -305,11 +305,7 @@
axisConfiguration = configContext.getAxisConfiguration();
config.getServletContext().setAttribute(CONFIGURATION_CONTEXT, configContext);
- // setting the ServletConfig to AxisConfiguration
- Parameter servletConfigParam = new Parameter();
- servletConfigParam.setName(HTTPConstants.HTTP_SERVLETCONFIG);
- servletConfigParam.setValue(this.servletConfig);
- axisConfiguration.addParameter(servletConfigParam);
+
ListenerManager listenerManager = new ListenerManager();
listenerManager.init(configContext);
TransportInDescription transportInDescription = new TransportInDescription(
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org