Author: markt
Date: Mon Nov 25 23:13:37 2013
New Revision: 1545451
URL: http://svn.apache.org/r1545451
Log:
Backport automatic deployment changes part 13
Add dummy reload resources to trigger a reload if a WAR or DIR is added to an
XML
Add dummy redploy resources to trigger a redeploy if an XML is added to a WAR
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1483816
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1545451&r1=1545450&r2=1545451&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Mon
Nov 25 23:13:37 2013
@@ -708,6 +708,11 @@ public class HostConfig
if (warDocBase.exists()) {
deployedApp.redeployResources.put(warDocBase.getAbsolutePath(),
Long.valueOf(warDocBase.lastModified()));
+ } else {
+ // Trigger a reload if a WAR is added
+ deployedApp.reloadResources.put(
+ warDocBase.getAbsolutePath(),
+ Long.valueOf(0));
}
}
if (expandedDocBase.exists()) {
@@ -716,6 +721,12 @@ public class HostConfig
addWatchedResources(deployedApp,
expandedDocBase.getAbsolutePath(), context);
} else {
+ if (!isExternal && !unpackWARs) {
+ // Trigger a reload if a DIR is added
+ deployedApp.reloadResources.put(
+ expandedDocBase.getAbsolutePath(),
+ Long.valueOf(0));
+ }
addWatchedResources(deployedApp, null, context);
}
// Add the context XML to the list of files which should
trigger a redeployment
@@ -1001,6 +1012,12 @@ public class HostConfig
if (deployXML && xml.exists() && copyXML) {
deployedApp.redeployResources.put(xml.getAbsolutePath(),
Long.valueOf(xml.lastModified()));
+ } else if (!copyXML ) {
+ // In case an XML file is added to the config base later
+ deployedApp.redeployResources.put(
+ (new File(configBase(),
+ cn.getBaseName() + ".xml")).getAbsolutePath(),
+ Long.valueOf(0));
}
Class<?> clazz = Class.forName(host.getConfigClass());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
