tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@locus.apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup ContextConfig.java
Date Mon, 18 Sep 2000 23:51:03 GMT
craigmcc    00/09/18 16:51:03

  Modified:    catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java
  Log:
  Make it possible to execute Tomcat 4.0, in the absence of the JSSE jar files,
  as long as you do not try to enable an SSL connection.
  
  Revision  Changes    Path
  1.13      +7 -6      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
  
  Index: ContextConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ContextConfig.java	2000/09/14 00:14:57	1.12
  +++ ContextConfig.java	2000/09/18 23:51:03	1.13
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.12 2000/09/14 00:14:57 craigmcc Exp $
  - * $Revision: 1.12 $
  - * $Date: 2000/09/14 00:14:57 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.13 2000/09/18 23:51:03 craigmcc Exp $
  + * $Revision: 1.13 $
  + * $Date: 2000/09/18 23:51:03 $
    *
    * ====================================================================
    *
  @@ -100,7 +100,6 @@
   import org.apache.catalina.util.xml.SaxContext;
   import org.apache.catalina.util.xml.XmlAction;
   import org.apache.catalina.util.xml.XmlMapper;
  -import org.apache.catalina.valves.CertificatesValve;
   import org.apache.catalina.valves.ValveBase;
   
   
  @@ -109,7 +108,7 @@
    * of that Context, and the associated defined servlets.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.12 $ $Date: 2000/09/14 00:14:57 $
  + * @version $Revision: 1.13 $ $Date: 2000/09/18 23:51:03 $
    */
   
   public final class ContextConfig
  @@ -325,7 +324,9 @@
           // Instantiate a new CertificatesValve if possible
           Valve certificates = null;
           try {
  -            certificates = new CertificatesValve();
  +            Class clazz =
  +                Class.forName("org.apache.catalina.valves.CertificatesValve");
  +            certificates = (Valve) clazz.newInstance();
           } catch (Throwable t) {
               return;     // Probably JSSE classes not present
           }
  
  
  

Mime
View raw message