cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Embedded.java

[remm]

remm        01/09/19 16:53:02

  Modified:    catalina/src/share/org/apache/catalina/startup Embedded.java
  Log:
  - Use reflection to load the SSLServerSocketFactory, which removes the last
    compilation problem when trying to build with JDK 1.3 + servlet.jar + regexp.jar.
  - Hopefully, everyone's happy with the build process now :)
  
  Revision  Changes    Path
  1.12      +15 -6     
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java
  
  Index: Embedded.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Embedded.java     2001/09/11 20:28:41     1.11
  +++ Embedded.java     2001/09/19 23:53:02     1.12
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
 1.11 2001/09/11 20:28:41 craigmcc Exp $
  - * $Revision: 1.11 $
  - * $Date: 2001/09/11 20:28:41 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
 1.12 2001/09/19 23:53:02 remm Exp $
  + * $Revision: 1.12 $
  + * $Date: 2001/09/19 23:53:02 $
    *
    * ====================================================================
    *
  @@ -89,7 +89,7 @@
   import org.apache.catalina.loader.WebappLoader;
   import org.apache.catalina.logger.FileLogger;
   import org.apache.catalina.logger.SystemOutLogger;
  -import org.apache.catalina.net.SSLServerSocketFactory;
  +import org.apache.catalina.net.ServerSocketFactory;
   import org.apache.catalina.realm.MemoryRealm;
   import org.apache.catalina.util.LifecycleSupport;
   import org.apache.catalina.util.StringManager;
  @@ -148,7 +148,7 @@
    * </pre>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.11 $ $Date: 2001/09/11 20:28:41 $
  + * @version $Revision: 1.12 $ $Date: 2001/09/19 23:53:02 $
    */
   
   public class Embedded implements Lifecycle {
  @@ -512,7 +512,16 @@
           if (secure) {
               connector.setScheme("https");
               connector.setSecure(true);
  -            connector.setFactory(new SSLServerSocketFactory());
  +            try {
  +                Class serverSocketFactoryClass = Class.forName
  +                    ("org.apache.catalina.net.SSLServerSocketFactory");
  +                ServerSocketFactory factory = 
  +                    (ServerSocketFactory) 
  +                    serverSocketFactoryClass.newInstance();
  +                connector.setFactory(factory);
  +            } catch (Exception e) {
  +                logger.log("Couldn't load SSL server socket factory.");
  +            }
           }
   
           return (connector);