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 Sat, 23 Sep 2000 22:41:14 GMT
craigmcc    00/09/23 15:41:13

  Modified:    catalina/src/share/org/apache/catalina/loader
                        StandardClassLoader.java
               catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java
  Log:
  Correct registration of JAR files in WEB-INF/lib directories by the
  application classloader configuration.  The new class loader requires
  URLs.
  
  Revision  Changes    Path
  1.2       +4 -4      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java
  
  Index: StandardClassLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StandardClassLoader.java	2000/09/22 23:52:50	1.1
  +++ StandardClassLoader.java	2000/09/23 22:41:12	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
1.1 2000/09/22 23:52:50 craigmcc Exp $
  - * $Revision: 1.1 $
  - * $Date: 2000/09/22 23:52:50 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
1.2 2000/09/23 22:41:12 craigmcc Exp $
  + * $Revision: 1.2 $
  + * $Date: 2000/09/23 22:41:12 $
    *
    * ====================================================================
    *
  @@ -94,7 +94,7 @@
    * independently.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.1 $ $Date: 2000/09/22 23:52:50 $
  + * @version $Revision: 1.2 $ $Date: 2000/09/23 22:41:12 $
    */
   
   public class StandardClassLoader
  @@ -325,7 +325,7 @@
       public void addRepository(String repository) {
   
           if (debug >= 1)
  -            log("addRespository(" + repository + ")");
  +            log("addRepository(" + repository + ")");
   
           // Add this repository to our underlying class loader
           try {
  
  
  
  1.16      +7 -8      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ContextConfig.java	2000/09/22 23:52:52	1.15
  +++ ContextConfig.java	2000/09/23 22:41:13	1.16
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.15 2000/09/22 23:52:52 craigmcc Exp $
  - * $Revision: 1.15 $
  - * $Date: 2000/09/22 23:52:52 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.16 2000/09/23 22:41:13 craigmcc Exp $
  + * $Revision: 1.16 $
  + * $Date: 2000/09/23 22:41:13 $
    *
    * ====================================================================
    *
  @@ -108,7 +108,7 @@
    * of that Context, and the associated defined servlets.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.15 $ $Date: 2000/09/22 23:52:52 $
  + * @version $Revision: 1.16 $ $Date: 2000/09/23 22:41:13 $
    */
   
   public final class ContextConfig
  @@ -774,10 +774,9 @@
   		        continue;
   		    File jarFile = new File(libFile, filenames[i]);
   		    if (debug > 0)
  -		        log(" Adding '" + jarFile.getAbsolutePath() + "'");
  -                    //	    loader.addRepository(jarFile.getAbsolutePath());
  -		    loader.addRepository("jar:" + libURL.toString() +
  -                                         "!/" + libFile);
  +		        log(" Adding '" + "file: " +
  +                            jarFile.getAbsolutePath() + "'");
  +                    loader.addRepository("file:" + jarFile.getAbsolutePath());
   		}
   	    }
   	}
  
  
  

Mime
View raw message