cvs commit: xml-axis/java/src/org/apache/axis/i18n resource.properties

[dims]

dims        2002/09/21 18:31:36

  Modified:    java/src/org/apache/axis/configuration
                        EngineConfigurationFactoryServlet.java
               java/src/org/apache/axis/i18n resource.properties
  Log:
  Possible fix for 11690 - Cannot use Axis with JBoss 3
  
  Note:
  - Added a fallback to the server-config.wsdd in our jar file.
  
  Revision  Changes    Path
  1.15      +12 -1     
xml-axis/java/src/org/apache/axis/configuration/EngineConfigurationFactoryServlet.java
  
  Index: EngineConfigurationFactoryServlet.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/src/org/apache/axis/configuration/EngineConfigurationFactoryServlet.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- EngineConfigurationFactoryServlet.java    18 Sep 2002 16:10:30 -0000      1.14
  +++ EngineConfigurationFactoryServlet.java    22 Sep 2002 01:31:36 -0000      1.15
  @@ -65,8 +65,10 @@
   import org.apache.axis.ConfigurationException;
   import org.apache.axis.EngineConfiguration;
   import org.apache.axis.EngineConfigurationFactory;
  +import org.apache.axis.AxisEngine;
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.axis.utils.Messages;
  +import org.apache.axis.utils.ClassUtils;
   import org.apache.commons.logging.Log;
   
   /**
  @@ -182,12 +184,21 @@
                   }
               }
           }
  -
  +        
           if (config == null) {
               try {
                   config = new FileProvider(realWebInfPath, SERVER_CONFIG_FILE);
               } catch (ConfigurationException e) {
                   log.error(Messages.getMessage("servletEngineWebInfError00"), e);
  +            }
  +        }
  +
  +        if (config == null) {
  +            try {
  +                InputStream is = ClassUtils.getResourceAsStream(AxisEngine.class, 
SERVER_CONFIG_FILE);
  +                config = new FileProvider(is);
  +            } catch (Exception e) {
  +                log.error(Messages.getMessage("servletEngineWebInfError02"), e);
               }
           }
   
  
  
  
  1.2       +1 -0      xml-axis/java/src/org/apache/axis/i18n/resource.properties
  
  Index: resource.properties
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/i18n/resource.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- resource.properties       20 Sep 2002 20:55:02 -0000      1.1
  +++ resource.properties       22 Sep 2002 01:31:36 -0000      1.2
  @@ -565,6 +565,7 @@
   
   servletEngineWebInfError00=Problem with servlet engine /WEB-INF directory
   servletEngineWebInfError01=Problem with servlet engine config file: {0}
  +servletEngineWebInfError02=Problem with servlet engine config file (loading from 
jar)
   
   setCurrMsg00=Setting current message form to: {0} (current message is now {1})
   setProp00=Setting {0} property in {1}