You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2003/11/25 19:50:55 UTC
cvs commit: ws-axis/java/src/org/apache/axis/configuration EngineConfigurationFactoryServlet.java
dims 2003/11/25 10:50:55
Modified: java/src/org/apache/axis/transport/http AxisServletBase.java
java/src/org/apache/axis/configuration
EngineConfigurationFactoryServlet.java
Log:
Fix for Bug 24977 - Allow EngineConfigurationFactoryServlet to peek informations from servlet's init-param
from guillaume.sauthier@bull.net (Guillaume Sauthier)
Revision Changes Path
1.23 +1 -1 ws-axis/java/src/org/apache/axis/transport/http/AxisServletBase.java
Index: AxisServletBase.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/transport/http/AxisServletBase.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- AxisServletBase.java 22 Apr 2003 19:35:51 -0000 1.22
+++ AxisServletBase.java 25 Nov 2003 18:50:55 -0000 1.23
@@ -283,7 +283,7 @@
webInfPath + File.separator + "attachments");
EngineConfiguration config =
- EngineConfigurationFactoryFinder.newFactory(context)
+ EngineConfigurationFactoryFinder.newFactory(servlet)
.getServerEngineConfig();
if (config != null) {
1.23 +6 -5 ws-axis/java/src/org/apache/axis/configuration/EngineConfigurationFactoryServlet.java
Index: EngineConfigurationFactoryServlet.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/configuration/EngineConfigurationFactoryServlet.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- EngineConfigurationFactoryServlet.java 22 Apr 2003 19:34:13 -0000 1.22
+++ EngineConfigurationFactoryServlet.java 25 Nov 2003 18:50:55 -0000 1.23
@@ -55,16 +55,17 @@
package org.apache.axis.configuration;
+import org.apache.axis.AxisProperties;
import org.apache.axis.ConfigurationException;
import org.apache.axis.EngineConfiguration;
import org.apache.axis.EngineConfigurationFactory;
-import org.apache.axis.AxisProperties;
import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.server.AxisServer;
import org.apache.axis.utils.ClassUtils;
import org.apache.axis.utils.Messages;
import org.apache.commons.logging.Log;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import java.io.File;
import java.io.InputStream;
@@ -114,8 +115,8 @@
* FileProvider/EngineConfiguration pretend to be independent,
* but they are tightly bound to an engine instance...
*/
- return (param instanceof ServletContext)
- ? new EngineConfigurationFactoryServlet((ServletContext)param)
+ return (param instanceof ServletConfig)
+ ? new EngineConfigurationFactoryServlet((ServletConfig)param)
: null;
}
@@ -123,9 +124,9 @@
* Create the default engine configuration and detect whether the user
* has overridden this with their own.
*/
- protected EngineConfigurationFactoryServlet(ServletContext ctx) {
+ protected EngineConfigurationFactoryServlet(ServletConfig conf) {
super();
- this.ctx = ctx;
+ this.ctx = conf.getServletContext();
}
/**