You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/11/02 02:00:17 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup HostConfig.java
craigmcc 00/11/01 17:00:17
Modified: . RELEASE-NOTES-4.0-M4.txt
catalina/src/share/org/apache/catalina/startup
HostConfig.java
Log:
Deploy a directory (under webapps) as an application if it at least has
a WEB-INF subdirectory inside. Previously, tested for the existence of
a web.xml file, which isn't strictly necessary given the defaults that are
loaded from $CATALINA_HOME/conf/web.xml.
Revision Changes Path
1.3 +5 -1 jakarta-tomcat-4.0/RELEASE-NOTES-4.0-M4.txt
Index: RELEASE-NOTES-4.0-M4.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/RELEASE-NOTES-4.0-M4.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RELEASE-NOTES-4.0-M4.txt 2000/11/01 00:39:32 1.2
+++ RELEASE-NOTES-4.0-M4.txt 2000/11/02 01:00:16 1.3
@@ -3,7 +3,7 @@
Release Notes
=============
-$Id: RELEASE-NOTES-4.0-M4.txt,v 1.2 2000/11/01 00:39:32 craigmcc Exp $
+$Id: RELEASE-NOTES-4.0-M4.txt,v 1.3 2000/11/02 01:00:16 craigmcc Exp $
============
@@ -95,7 +95,9 @@
web applications configured, some that require client certificates and some
that do not, communicating through the same SSL sockets.
+Jasper: Support the new TryCatchFinally interface for tag libraries.
+
=========
BUG FIXES:
=========
@@ -118,6 +120,8 @@
Jasper: Accept the "jsp_precompile=" query parameter in conformance to the
specification.
+
+Jasper: Do not complain if there is no web.xml file present.
==============================
1.3 +8 -8 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HostConfig.java 2000/10/04 23:03:05 1.2
+++ HostConfig.java 2000/11/02 01:00:16 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v 1.2 2000/10/04 23:03:05 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2000/10/04 23:03:05 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v 1.3 2000/11/02 01:00:16 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2000/11/02 01:00:16 $
*
* ====================================================================
*
@@ -93,7 +93,7 @@
* of that Host, and the associated defined contexts.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2000/10/04 23:03:05 $
+ * @version $Revision: 1.3 $ $Date: 2000/11/02 01:00:16 $
*/
public final class HostConfig
@@ -273,10 +273,10 @@
File dir = new File(appBase, files[i]);
if (dir.isDirectory()) {
- // Make sure there is an application deployment descriptor
- File webXml = new File(dir, "/WEB-INF/web.xml");
- if (!webXml.exists() || !webXml.isFile() ||
- !webXml.canRead())
+ // Make sure there is an application configuration directory
+ 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