Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 65577 invoked from network); 22 Apr 2002 00:01:29 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 22 Apr 2002 00:01:29 -0000 Received: (qmail 27244 invoked by uid 97); 22 Apr 2002 00:01:31 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 27228 invoked by uid 97); 22 Apr 2002 00:01:30 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 27217 invoked by uid 97); 22 Apr 2002 00:01:30 -0000 Date: 22 Apr 2002 00:01:21 -0000 Message-ID: <20020422000121.22022.qmail@icarus.apache.org> From: glenn@apache.org To: jakarta-tomcat-4.0-cvs@apache.org Subject: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup HostConfig.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N 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: For additional commands, e-mail: