costin      01/09/08 17:46:28

  Modified:    src/share/org/apache/tomcat/startup EmbededTomcat.java
                        Main.java
  Log:
  Bug 3498 - revert to the documented system properties for the classpath.
  
  Thanks [EMAIL PROTECTED] (Arun Katkere) for noticing this.
  
  Revision  Changes    Path
  1.53      +5 -2      
jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java
  
  Index: EmbededTomcat.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- EmbededTomcat.java        2001/09/07 04:25:20     1.52
  +++ EmbededTomcat.java        2001/09/09 00:46:28     1.53
  @@ -668,10 +668,13 @@
       // -------------------- Class loader methods --------------------
   
       static final Jdk11Compat jdk11Compat=Jdk11Compat.getJdkCompat();
  +    /** System property used to set the application class loader, which
  +     will be the parent of all webapps.
  +    */
       public static final String PROPERTY_APPS_LOADER =
  -     "org.apache.tomcat.apps.loader";
  +     "org.apache.tomcat.apps.classpath";
       public static final String PROPERTY_CONTAINER_LOADER =
  -     "org.apache.tomcat.container.loader";
  +     "org.apache.tomcat.container.classpath";
        
   
       /** Initialize class loaders with the defaults, if not set
  
  
  
  1.41      +8 -2      jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- Main.java 2001/09/07 04:25:20     1.40
  +++ Main.java 2001/09/09 00:46:28     1.41
  @@ -1,4 +1,4 @@
  -/* $Id: Main.java,v 1.40 2001/09/07 04:25:20 costin Exp $
  +/* $Id: Main.java,v 1.41 2001/09/09 00:46:28 costin Exp $
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
  @@ -94,8 +94,14 @@
    * @author Mel Martinez [EMAIL PROTECTED]
    */
   public class Main{
  +    /** System property that can be used to pass additional classpath
  +     to the 'common' loader, used to load EmbededTomcat and the
  +     core. EmbededTomcat will load the container int a separate
  +     loader, and each applications will be set up int its own loader.
  +     The loader configurator module may use additional properties
  +    */
       public static final String PROPERTY_COMMON_LOADER =
  -     "org.apache.tomcat.common.loader";
  +     "org.apache.tomcat.common.classpath";
   
       String installDir;
       String libDir;
  
  
  

Reply via email to