cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader WebappLoader.java

[remm]

remm        01/06/19 10:38:02

  Modified:    catalina/src/share/org/apache/catalina/loader
                        WebappLoader.java
  Log:
  - Add a permission for the work dir.
  
  Revision  Changes    Path
  1.2       +12 -4     
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WebappLoader.java 2001/06/19 02:12:49     1.1
  +++ WebappLoader.java 2001/06/19 17:38:00     1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.1 2001/06/19 02:12:49 remm Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/06/19 02:12:49 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.2 2001/06/19 17:38:00 remm Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/06/19 17:38:00 $
    *
    * ====================================================================
    *
  @@ -119,7 +119,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.1 $ $Date: 2001/06/19 02:12:49 $
  + * @version $Revision: 1.2 $ $Date: 2001/06/19 17:38:00 $
    */
   
   public class WebappLoader
  @@ -643,6 +643,14 @@
                           ((WebappClassLoader)classLoader).setPermissions
                               (rootUrl);
                    }
  +                    File workDir = 
  +                        (File) servletContext.getAttribute
  +                        (Globals.WORK_DIR_ATTR);
  +                    if (workDir != null) {
  +                        File libDir = new File(workDir, "WEB-INF/lib/");
  +                        ((WebappClassLoader)classLoader).setPermissions
  +                            (libDir.getAbsolutePath());
  +                    }
                } catch (MalformedURLException e) {
                }
            }