tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gl...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup HostConfig.java
Date Mon, 22 Apr 2002 00:01:21 GMT
glenn       02/04/21 17:01:21

  Modified:    catalina/src/share/org/apache/catalina/startup
                        HostConfig.java
  Log:
  Renable deployDirectories test for WEB-INF directory
  
  Revision  Changes    Path
  1.21      +7 -6      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java
  
  Index: HostConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- HostConfig.java	20 Mar 2002 12:29:56 -0000	1.20
  +++ HostConfig.java	22 Apr 2002 00:01:21 -0000	1.21
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
1.20 2002/03/20 12:29:56 glenn Exp $
  - * $Revision: 1.20 $
  - * $Date: 2002/03/20 12:29:56 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
1.21 2002/04/22 00:01:21 glenn Exp $
  + * $Revision: 1.21 $
  + * $Date: 2002/04/22 00:01:21 $
    *
    * ====================================================================
    *
  @@ -102,7 +102,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.20 $ $Date: 2002/03/20 12:29:56 $
  + * @version $Revision: 1.21 $ $Date: 2002/04/22 00:01:21 $
    */
   
   public class HostConfig
  @@ -537,12 +537,13 @@
                   deployed.add(files[i]);
   
                   // Make sure there is an application configuration directory
  -                /* Don't be more fussy than the Deployer implementation is
  +                // This is needed if the Context appBase is the same as the
  +                // web server document root to make sure only web applications
  +                // are deployed and not directories for web space.
                   File webInf = new File(dir, "/WEB-INF");
                   if (!webInf.exists() || !webInf.isDirectory() ||
                       !webInf.canRead())
                       continue;
  -                */
   
                   // Calculate the context path and make sure it is unique
                   String contextPath = "/" + files[i];
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message