remm 2003/09/02 11:47:54 Modified: catalina/src/share/org/apache/catalina/startup HostConfig.java Log: - Deploy descriptors even if deployOnStartup is false, as they should be considered as if they were part of server.xml (IMO). Revision Changes Path 1.23 +12 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java Index: HostConfig.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- HostConfig.java 17 Aug 2003 08:32:53 -0000 1.22 +++ HostConfig.java 2 Sep 2003 18:47:54 -0000 1.23 @@ -1006,6 +1006,14 @@ if (host.getDeployOnStartup()) { deployApps(); + } else { + // Deploy descriptors anyway (it should be equivalent to being + // part of server.xml) + File configBase = configBase(); + if (configBase.exists() && configBase.isDirectory()) { + String configFiles[] = configBase.list(); + deployDescriptors(configBase, configFiles); + } } }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]