You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/03/04 23:36:50 UTC
svn commit: r1664173 - in /tomcat/trunk:
java/org/apache/catalina/startup/HostConfig.java
webapps/docs/config/valve.xml
Author: markt
Date: Wed Mar 4 22:36:50 2015
New Revision: 1664173
URL: http://svn.apache.org/r1664173
Log:
Revert r1664172 as it included unintended changes
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/webapps/docs/config/valve.xml
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=1664173&r1=1664172&r2=1664173&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Wed Mar 4 22:36:50 2015
@@ -598,14 +598,13 @@ public class HostConfig
}
}
- boolean unpackWAR = unpackWARs;
- if (unpackWAR && context instanceof StandardContext) {
- unpackWAR = ((StandardContext) context).getUnpackWAR();
- }
-
// Add the eventual unpacked WAR and all the resources which will be
// watched inside it
if (isExternalWar) {
+ boolean unpackWAR = unpackWARs;
+ if (unpackWAR && context instanceof StandardContext) {
+ unpackWAR = ((StandardContext) context).getUnpackWAR();
+ }
if (unpackWAR) {
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
Long.valueOf(expandedDocBase.lastModified()));
@@ -627,7 +626,7 @@ public class HostConfig
Long.valueOf(0));
}
}
- if (unpackWAR) {
+ if (expandedDocBase.exists()) {
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
Long.valueOf(expandedDocBase.lastModified()));
addWatchedResources(deployedApp,
@@ -635,9 +634,8 @@ public class HostConfig
} else {
addWatchedResources(deployedApp, null, context);
}
+ // Add the context XML to the list of files which should trigger a redeployment
if (!isExternal) {
- // For external docBases, the context.xml will have been
- // added above.
deployedApp.redeployResources.put(
contextXml.getAbsolutePath(),
Long.valueOf(contextXml.lastModified()));
Modified: tomcat/trunk/webapps/docs/config/valve.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1664173&r1=1664172&r2=1664173&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/trunk/webapps/docs/config/valve.xml Wed Mar 4 22:36:50 2015
@@ -343,11 +343,10 @@
logged by the Access Log Valve may represent the reverse proxy, the browser
or some combination of the two depending on the configuration of Tomcat and
the reverse proxy. For Tomcat configuration options see
- <a href="#Proxies_Support">Proxies Support</a> and the
- <a href="../proxy-howto.html">Proxy How-To</a>. For reverse proxies that
+ <a href="#Proxies_Support">Proxies Support</a>. For reverse proxies that
use mod_jk, see the <a
href="http://tomcat.apache.org/connectors-doc/generic_howto/proxy.html">generic
- proxy</a> documentation. For other reverse proxies, consult their
+ proxy</a> docmentation. For other reverse proxies, consult their
documentation.</p>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org