tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Catalina.java
Date Thu, 21 Jun 2001 04:18:53 GMT
remm        01/06/20 21:18:53

  Modified:    catalina/src/share/org/apache/catalina/startup Catalina.java
  Log:
  - Set the javaURLContextFactory as the JNDI IC factory. That feature was
    present some time ago, but was removed because of fear of conflicts (which
    turns out not to be a problem at all).
  
  Revision  Changes    Path
  1.25      +6 -4      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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Catalina.java	2001/06/21 03:42:35	1.24
  +++ Catalina.java	2001/06/21 04:18:50	1.25
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.24 2001/06/21 03:42:35 remm Exp $
  - * $Revision: 1.24 $
  - * $Date: 2001/06/21 03:42:35 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.25 2001/06/21 04:18:50 remm Exp $
  + * $Revision: 1.25 $
  + * $Date: 2001/06/21 04:18:50 $
    *
    * ====================================================================
    *
  @@ -98,7 +98,7 @@
    * </u>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.24 $ $Date: 2001/06/21 03:42:35 $
  + * @version $Revision: 1.25 $ $Date: 2001/06/21 04:18:50 $
    */
   
   public class Catalina {
  @@ -706,6 +706,8 @@
                   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
  
  
  

Mime
View raw message