axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/transport/http AxisServlet.java
Date Wed, 30 Jan 2002 16:19:11 GMT
glyn        02/01/30 08:19:11

  Modified:    java/src/org/apache/axis EngineConfiguration.java
               java/src/org/apache/axis/client ServiceFactory.java
               java/src/org/apache/axis/server
                        DefaultAxisServerFactory.java
                        JNDIAxisServerFactory.java
               java/src/org/apache/axis/transport/http AxisServlet.java
  Log:
  The "provider" option in AxisServlet.getEngine should be "engineConfig".
  Define a constant to avoid these literals getting out of step again.
  
  Bug reported by Greg Truty.
  
  Revision  Changes    Path
  1.3       +6 -0      xml-axis/java/src/org/apache/axis/EngineConfiguration.java
  
  Index: EngineConfiguration.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/EngineConfiguration.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EngineConfiguration.java	28 Jan 2002 18:22:59 -0000	1.2
  +++ EngineConfiguration.java	30 Jan 2002 16:19:11 -0000	1.3
  @@ -75,6 +75,12 @@
    * @author Glen Daniels (gdaniels@macromedia.com)
    */
   public interface EngineConfiguration {
  +    /**
  +     * Property name used for setting an EngineConfiguration to be used
  +     * in creating engines.
  +     */
  +    public static final String PROPERTY_NAME = "engineConfig";
  +
        /**
        * Configure this AxisEngine using whatever data source we have.
        *
  
  
  
  1.3       +2 -2      xml-axis/java/src/org/apache/axis/client/ServiceFactory.java
  
  Index: ServiceFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/ServiceFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ServiceFactory.java	28 Jan 2002 18:23:00 -0000	1.2
  +++ ServiceFactory.java	30 Jan 2002 16:19:11 -0000	1.3
  @@ -45,8 +45,8 @@
           Service service = null;
           InitialContext context = null;
   
  -        EngineConfiguration configProvider =
  -                (EngineConfiguration)environment.get("engineConfig");
  +        EngineConfiguration configProvider = (EngineConfiguration)environment.
  +            get(EngineConfiguration.PROPERTY_NAME);
           if (configProvider == null)
               configProvider = (EngineConfiguration)threadDefaultConfig.get();
   
  
  
  
  1.4       +2 -1      xml-axis/java/src/org/apache/axis/server/DefaultAxisServerFactory.java
  
  Index: DefaultAxisServerFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/server/DefaultAxisServerFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultAxisServerFactory.java	28 Jan 2002 18:23:02 -0000	1.3
  +++ DefaultAxisServerFactory.java	30 Jan 2002 16:19:11 -0000	1.4
  @@ -30,7 +30,8 @@
       {
           EngineConfiguration config = null;
           try {
  -            config = (EngineConfiguration)environment.get("engineConfig");
  +            config = (EngineConfiguration)environment.
  +                get(EngineConfiguration.PROPERTY_NAME);
           } catch (ClassCastException e) {
               // Just in case, fall through here.
           }
  
  
  
  1.4       +2 -1      xml-axis/java/src/org/apache/axis/server/JNDIAxisServerFactory.java
  
  Index: JNDIAxisServerFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/server/JNDIAxisServerFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JNDIAxisServerFactory.java	28 Jan 2002 18:23:02 -0000	1.3
  +++ JNDIAxisServerFactory.java	30 Jan 2002 16:19:11 -0000	1.4
  @@ -51,7 +51,8 @@
           
           EngineConfiguration config = null;
           try {
  -            config = (EngineConfiguration)environment.get("engineConfig");
  +            config = (EngineConfiguration)environment.
  +                get(EngineConfiguration.PROPERTY_NAME);
           } catch (ClassCastException e) {
               // Just in case, fall through here.
           }
  
  
  
  1.72      +2 -1      xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java
  
  Index: AxisServlet.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- AxisServlet.java	9 Jan 2002 15:10:58 -0000	1.71
  +++ AxisServlet.java	30 Jan 2002 16:19:11 -0000	1.72
  @@ -60,6 +60,7 @@
   import org.apache.axis.Constants;
   import org.apache.axis.Message;
   import org.apache.axis.MessageContext;
  +import org.apache.axis.EngineConfiguration;
   import org.apache.axis.configuration.FileProvider;
   import org.apache.axis.message.SOAPEnvelope;
   import org.apache.axis.message.SOAPFaultElement;
  @@ -155,7 +156,7 @@
   
               Map environment = new HashMap();
               environment.put("servletContext", context);
  -            environment.put("provider", provider);
  +            environment.put(EngineConfiguration.PROPERTY_NAME, provider);
   
               // Obtain an AxisServer by using whatever AxisServerFactory is
               // registered.  The default one will just use the provider we
  
  
  

Mime
View raw message