You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2001/04/05 02:08:47 UTC

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

remm        01/04/04 17:08:47

  Modified:    catalina/src/share/org/apache/catalina/startup Catalina.java
  Log:
  - Don't set an initial context factory.
  
  Revision  Changes    Path
  1.18      +4 -6      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java
  
  Index: Catalina.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Catalina.java	2001/03/15 05:34:56	1.17
  +++ Catalina.java	2001/04/05 00:08:47	1.18
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v 1.17 2001/03/15 05:34:56 remm Exp $
  - * $Revision: 1.17 $
  - * $Date: 2001/03/15 05:34:56 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v 1.18 2001/04/05 00:08:47 remm Exp $
  + * $Revision: 1.18 $
  + * $Date: 2001/04/05 00:08:47 $
    *
    * ====================================================================
    *
  @@ -97,7 +97,7 @@
    * </u>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.17 $ $Date: 2001/03/15 05:34:56 $
  + * @version $Revision: 1.18 $ $Date: 2001/04/05 00:08:47 $
    */
   
   public class Catalina {
  @@ -676,8 +676,6 @@
                   value = value + ":" + oldValue;
               }
               System.setProperty(javax.naming.Context.URL_PKG_PREFIXES, value);
  -            System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY,
  -                               "org.apache.naming.java.javaURLContextFactory");
           }
   
   	// If a SecurityManager is being used, set properties for