Author: markt
Date: Thu Mar 31 12:37:10 2011
New Revision: 1087281
URL: http://svn.apache.org/viewvc?rev=1087281&view=rev
Log:
Follow up to http://svn.apache.org/viewvc?rev=1086969&view=rev
Ensure that when copyXML=false:
- removing context.xml triggers a redploy but does not remove any other files
- removing context.xml triggers a redploy and the context.xml is re-copied from
the WAR
This should be consistent with behaviour when copyXML=true
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1087281&r1=1087280&r2=1087281&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Thu Mar 31
12:37:10 2011
@@ -795,7 +795,7 @@ public class HostConfig
if (entry != null) {
xmlInWar = true;
}
- if (copyXML && xmlInWar) {
+ if ((copyXML || unpackWARs) && xmlInWar) {
istream = jar.getInputStream(entry);
ostream =
@@ -915,7 +915,7 @@ public class HostConfig
deployedApp.redeployResources.put
(war.getAbsolutePath(), Long.valueOf(war.lastModified()));
- if (deployXML && xml.exists()) {
+ if (deployXML && xml.exists() && copyXML) {
deployedApp.redeployResources.put(xml.getAbsolutePath(),
Long.valueOf(xml.lastModified()));
}
@@ -938,7 +938,7 @@ public class HostConfig
Long.valueOf(docBase.lastModified()));
addWatchedResources(deployedApp, docBase.getAbsolutePath(),
context);
- if (deployXML && !copyXML && xmlInWar) {
+ if (deployXML && !copyXML && (xmlInWar || xml.exists())) {
deployedApp.redeployResources.put(xml.getAbsolutePath(),
Long.valueOf(xml.lastModified()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
