craigmcc 01/10/27 12:05:17
Modified: catalina/src/share/org/apache/catalina/startup
HostConfig.java
Log:
When auto-deploying directories as web apps, don't be fussy about whether
there is a "WEB-INF" subdirectory or not. This is consistent with the
other cases where manual or automatic deployment take place.
Revision Changes Path
1.14 +6 -4
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- HostConfig.java 2001/10/25 00:23:03 1.13
+++ HostConfig.java 2001/10/27 19:05:17 1.14
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
1.13 2001/10/25 00:23:03 craigmcc Exp $
- * $Revision: 1.13 $
- * $Date: 2001/10/25 00:23:03 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
1.14 2001/10/27 19:05:17 craigmcc Exp $
+ * $Revision: 1.14 $
+ * $Date: 2001/10/27 19:05:17 $
*
* ====================================================================
*
@@ -101,7 +101,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.13 $ $Date: 2001/10/25 00:23:03 $
+ * @version $Revision: 1.14 $ $Date: 2001/10/27 19:05:17 $
*/
public class HostConfig
@@ -329,10 +329,12 @@
deployed.add(files[i]);
// Make sure there is an application configuration directory
+ /* Don't be more fussy than the Deployer implementation is
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:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
