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/01/24 03:33:01 UTC

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java

remm        01/01/23 18:33:01

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java
  Log:
  - Add bind / unbind calls during init to allow resolving of nested JAR URLs.
  
  Revision  Changes    Path
  1.36      +7 -4      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- StandardContext.java	2001/01/23 05:05:46	1.35
  +++ StandardContext.java	2001/01/24 02:33:01	1.36
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v 1.35 2001/01/23 05:05:46 remm Exp $
  - * $Revision: 1.35 $
  - * $Date: 2001/01/23 05:05:46 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v 1.36 2001/01/24 02:33:01 remm Exp $
  + * $Revision: 1.36 $
  + * $Date: 2001/01/24 02:33:01 $
    *
    * ====================================================================
    *
  @@ -99,6 +99,7 @@
   import org.apache.naming.resources.FileDirContext;
   import org.apache.naming.resources.WARDirContext;
   import org.apache.naming.resources.BaseDirContext;
  +import org.apache.naming.resources.DirContextURLStreamHandler;
   import org.apache.catalina.Container;
   import org.apache.catalina.ContainerListener;
   import org.apache.catalina.Context;
  @@ -137,7 +138,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.35 $ $Date: 2001/01/23 05:05:46 $
  + * @version $Revision: 1.36 $ $Date: 2001/01/24 02:33:01 $
    */
   
   public class StandardContext
  @@ -3000,6 +3001,7 @@
           }
   
           // Load the collected "load on startup" servlets
  +        DirContextURLStreamHandler.bind(getResources());
           if (debug >= 1)
               log("Loading " + map.size() + " load-on-startup servlets");
           Iterator keys = map.keySet().iterator();
  @@ -3017,6 +3019,7 @@
                   }
               }
           }
  +        DirContextURLStreamHandler.unbind();
   
           if (debug >= 1)
               log("Starting completed");