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 2011/11/14 23:07:08 UTC
svn commit: r1201928 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/catalina/core/ java/org/apache/catalina/startup/
java/org/apache/catalina/util/ webapps/docs/
Author: markt
Date: Mon Nov 14 22:07:08 2011
New Revision: 1201928
URL: http://svn.apache.org/viewvc?rev=1201928&view=rev
Log:
Improve handling of failed deployments
- Allow failed configurations to be fixed via JMX
- Ensure once a deployment fails, the context is not deployed
- Ensure changes to any context.xml file trigger redeployment rather than reloading
- Tweak base lifecycle implementation to allow failed components to be restarted once they have been fixed
Added:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java (with props)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/LifecycleBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 14 22:07:08 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187
753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,1199996,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187
753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,1199996,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1201928&r1=1201927&r2=1201928&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java Mon Nov 14 22:07:08 2011
@@ -862,20 +862,12 @@ public abstract class ContainerBase exte
if ((getState().isAvailable() ||
LifecycleState.STARTING_PREP.equals(getState())) &&
startChildren) {
- boolean success = false;
try {
child.start();
- success = true;
} catch (LifecycleException e) {
log.error("ContainerBase.addChild: start: ", e);
throw new IllegalStateException
("ContainerBase.addChild: start: " + e);
- } finally {
- if (!success) {
- synchronized (children) {
- children.remove(child.getName());
- }
- }
}
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1201928&r1=1201927&r2=1201928&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon Nov 14 22:07:08 2011
@@ -565,13 +565,6 @@ public class ContextConfig
try {
source = new InputSource(contextXml.toString());
stream = contextXml.openStream();
-
- // Add as watched resource so that cascade reload occurs if a default
- // config file is modified/added/removed
- if ("file".equals(contextXml.getProtocol())) {
- context.addWatchedResource(
- (new File(contextXml.toURI())).getAbsolutePath());
- }
} catch (Exception e) {
log.error(sm.getString("contextConfig.contextMissing",
contextXml) , e);
@@ -1706,7 +1699,6 @@ public class ContextConfig
} else {
source = new InputSource(file.getAbsoluteFile().toURI().toString());
stream = new FileInputStream(file);
- context.addWatchedResource(file.getAbsolutePath());
}
if (stream != null && source != null) {
Added: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1201928&view=auto
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java (added)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java Mon Nov 14 22:07:08 2011
@@ -0,0 +1,649 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.startup;
+
+import java.beans.PropertyChangeListener;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Set;
+
+import javax.naming.directory.DirContext;
+import javax.servlet.ServletContainerInitializer;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletSecurityElement;
+import javax.servlet.descriptor.JspConfigDescriptor;
+
+import org.apache.catalina.AccessLog;
+import org.apache.catalina.Authenticator;
+import org.apache.catalina.Cluster;
+import org.apache.catalina.Container;
+import org.apache.catalina.ContainerListener;
+import org.apache.catalina.Context;
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.Loader;
+import org.apache.catalina.Manager;
+import org.apache.catalina.Pipeline;
+import org.apache.catalina.Realm;
+import org.apache.catalina.Valve;
+import org.apache.catalina.Wrapper;
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.catalina.core.ApplicationServletRegistration;
+import org.apache.catalina.deploy.ApplicationParameter;
+import org.apache.catalina.deploy.ErrorPage;
+import org.apache.catalina.deploy.FilterDef;
+import org.apache.catalina.deploy.FilterMap;
+import org.apache.catalina.deploy.LoginConfig;
+import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.SecurityConstraint;
+import org.apache.catalina.mbeans.MBeanUtils;
+import org.apache.catalina.util.CharsetMapper;
+import org.apache.catalina.util.LifecycleMBeanBase;
+import org.apache.juli.logging.Log;
+import org.apache.tomcat.JarScanner;
+import org.apache.tomcat.util.http.mapper.Mapper;
+import org.apache.tomcat.util.res.StringManager;
+
+/**
+ * An implementation of {@link Context} that is used as a place-holder for
+ * deployed applications when their deployment fails and a Context instance
+ * (usually {@link org.apache.catalina.core.StandardContext} but may be any
+ * Context implementation) cannot be created.
+ */
+public class FailedContext extends LifecycleMBeanBase implements Context {
+
+ protected static final StringManager sm =
+ StringManager.getManager(Constants.Package);
+
+
+ // --------------------- Methods that need to work even for a failed context
+
+ private URL configFile;
+ @Override
+ public URL getConfigFile() { return configFile; }
+ @Override
+ public void setConfigFile(URL configFile) { this.configFile = configFile; }
+
+
+ private String docBase;
+ @Override
+ public String getDocBase() { return docBase; }
+ @Override
+ public void setDocBase(String docBase) { this.docBase = docBase; }
+
+
+
+ private String name = null;
+ @Override
+ public String getName() { return name; }
+ @Override
+ public void setName(String name) { this.name = name; }
+
+
+ private Container parent;
+ @Override
+ public Container getParent() { return parent; }
+ @Override
+ public void setParent(Container parent) { this.parent = parent; }
+
+
+ private String path = null;
+ @Override
+ public String getPath() { return path; }
+ @Override
+ public void setPath(String path) { this.path = path; }
+
+
+ private String webappVersion = null;
+ @Override
+ public String getWebappVersion() { return webappVersion; }
+ @Override
+ public void setWebappVersion(String webappVersion) {
+ this.webappVersion = webappVersion;
+ }
+
+
+ @Override
+ protected String getDomainInternal() { return MBeanUtils.getDomain(this); }
+
+
+ @Override
+ protected String getObjectNameKeyProperties() {
+
+ StringBuilder keyProperties =
+ new StringBuilder("j2eeType=WebModule,name=//");
+
+ String hostname = getParent().getName();
+ if (hostname == null) {
+ keyProperties.append("DEFAULT");
+ } else {
+ keyProperties.append(hostname);
+ }
+
+ String contextName = getName();
+ if (!contextName.startsWith("/")) {
+ keyProperties.append('/');
+ }
+ keyProperties.append(contextName);
+
+ keyProperties.append(",J2EEApplication=none,J2EEServer=none");
+
+ return keyProperties.toString();
+ }
+
+
+ @Override
+ protected void startInternal() throws LifecycleException {
+ throw new LifecycleException(
+ sm.getString("failedContext.start", getName()));
+ }
+
+
+ @Override
+ protected void stopInternal() throws LifecycleException {
+ // NO-OP
+ // Allow stop to complete since it is used for clean-up
+ }
+
+
+ // Only need to read these
+ @Override
+ public void addWatchedResource(String name) { /* NO-OP */ }
+ @Override
+ public String[] findWatchedResources() { return new String[0]; }
+ @Override
+ public void removeWatchedResource(String name) { /* NO-OP */ }
+
+
+ @Override
+ public void addChild(Container child) { /* NO-OP */ }
+ @Override
+ public Container findChild(String name) { return null; }
+ @Override
+ public Container[] findChildren() { return new Container[0]; }
+ @Override
+ public void removeChild(Container child) { /* NO-OP */ }
+
+
+ // -------------------------------------------- All NO-OPs beyond this point
+ @Override
+ public Loader getLoader() { return null; }
+ @Override
+ public void setLoader(Loader loader) { /* NO-OP */ }
+
+ @Override
+ public Log getLogger() { return null; }
+
+ @Override
+ public Manager getManager() { return null; }
+ @Override
+ public void setManager(Manager manager) { /* NO-OP */ }
+
+ @Override
+ public Pipeline getPipeline() { return null; }
+
+ @Override
+ public Cluster getCluster() { return null; }
+ @Override
+ public void setCluster(Cluster cluster) { /* NO-OP */ }
+
+ @Override
+ public int getBackgroundProcessorDelay() { return -1; }
+ @Override
+ public void setBackgroundProcessorDelay(int delay) { /* NO-OP */ }
+
+ @Override
+ public ClassLoader getParentClassLoader() { return null; }
+ @Override
+ public void setParentClassLoader(ClassLoader parent) { /* NO-OP */ }
+
+ @Override
+ public Realm getRealm() { return null; }
+ @Override
+ public void setRealm(Realm realm) { /* NO-OP */ }
+
+ @Override
+ public DirContext getResources() { return null; }
+ @Override
+ public void setResources(DirContext resources) { /* NO-OP */ }
+
+ @Override
+ public void backgroundProcess() { /* NO-OP */ }
+
+ @Override
+ public void addContainerListener(ContainerListener listener) { /* NO-OP */ }
+ @Override
+ public ContainerListener[] findContainerListeners() { return null; }
+ @Override
+ public void removeContainerListener(ContainerListener listener) { /* NO-OP */ }
+
+ @Override
+ public void addPropertyChangeListener(PropertyChangeListener listener) { /* NO-OP */ }
+ @Override
+ public void removePropertyChangeListener(PropertyChangeListener listener) { /* NO-OP */ }
+
+ @Override
+ public void invoke(Request request, Response response) throws IOException,
+ ServletException { /* NO-OP */ }
+
+ @Override
+ public void fireContainerEvent(String type, Object data) { /* NO-OP */ }
+
+ @Override
+ public void logAccess(Request request, Response response, long time,
+ boolean useDefault) { /* NO-OP */ }
+
+ @Override
+ public AccessLog getAccessLog() { return null; }
+
+ @Override
+ public int getStartStopThreads() { return 0; }
+ @Override
+ public void setStartStopThreads(int startStopThreads) { /* NO-OP */ }
+
+ @Override
+ public boolean getAllowCasualMultipartParsing() { return false; }
+ @Override
+ public void setAllowCasualMultipartParsing(
+ boolean allowCasualMultipartParsing) { /* NO-OP */ }
+
+ @Override
+ public Object[] getApplicationEventListeners() { return null; }
+ @Override
+ public void setApplicationEventListeners(Object[] listeners) { /* NO-OP */ }
+
+ @Override
+ public Object[] getApplicationLifecycleListeners() { return null; }
+ @Override
+ public void setApplicationLifecycleListeners(Object[] listeners) { /* NO-OP */ }
+
+ @Override
+ public boolean getAvailable() { return false; }
+
+ @Override
+ public CharsetMapper getCharsetMapper() { return null; }
+ @Override
+ public void setCharsetMapper(CharsetMapper mapper) { /* NO-OP */ }
+
+ @Override
+ public boolean getConfigured() { return false; }
+ @Override
+ public void setConfigured(boolean configured) { /* NO-OP */ }
+
+ @Override
+ public boolean getCookies() { return false; }
+ @Override
+ public void setCookies(boolean cookies) { /* NO-OP */ }
+
+ @Override
+ public String getSessionCookieName() { return null; }
+ @Override
+ public void setSessionCookieName(String sessionCookieName) { /* NO-OP */ }
+
+ @Override
+ public boolean getUseHttpOnly() { return false; }
+ @Override
+ public void setUseHttpOnly(boolean useHttpOnly) { /* NO-OP */ }
+
+ @Override
+ public String getSessionCookieDomain() { return null; }
+ @Override
+ public void setSessionCookieDomain(String sessionCookieDomain) { /* NO-OP */ }
+
+ @Override
+ public String getSessionCookiePath() { return null; }
+ @Override
+ public void setSessionCookiePath(String sessionCookiePath) { /* NO-OP */ }
+
+ @Override
+ public boolean getSessionCookiePathUsesTrailingSlash() { return false; }
+ @Override
+ public void setSessionCookiePathUsesTrailingSlash(
+ boolean sessionCookiePathUsesTrailingSlash) { /* NO-OP */ }
+
+ @Override
+ public boolean getCrossContext() { return false; }
+ @Override
+ public void setCrossContext(boolean crossContext) { /* NO-OP */ }
+
+ @Override
+ public String getAltDDName() { return null; }
+ @Override
+ public void setAltDDName(String altDDName) { /* NO-OP */ }
+
+ @Override
+ public String getDisplayName() { return null; }
+ @Override
+ public void setDisplayName(String displayName) { /* NO-OP */ }
+
+ @Override
+ public boolean getDistributable() { return false; }
+ @Override
+ public void setDistributable(boolean distributable) { /* NO-OP */ }
+
+ @Override
+ public String getEncodedPath() { return null; }
+
+ @Override
+ public boolean getIgnoreAnnotations() { return false; }
+ @Override
+ public void setIgnoreAnnotations(boolean ignoreAnnotations) { /* NO-OP */ }
+
+ @Override
+ public LoginConfig getLoginConfig() { return null; }
+ @Override
+ public void setLoginConfig(LoginConfig config) { /* NO-OP */ }
+
+ @Override
+ public Mapper getMapper() { return null; }
+
+ @Override
+ public NamingResources getNamingResources() { return null; }
+ @Override
+ public void setNamingResources(NamingResources namingResources) { /* NO-OP */ }
+
+ @Override
+ public String getPublicId() { return null; }
+ @Override
+ public void setPublicId(String publicId) { /* NO-OP */ }
+
+ @Override
+ public boolean getReloadable() { return false; }
+ @Override
+ public void setReloadable(boolean reloadable) { /* NO-OP */ }
+
+ @Override
+ public boolean getOverride() { return false; }
+ @Override
+ public void setOverride(boolean override) { /* NO-OP */ }
+
+ @Override
+ public boolean getPrivileged() { return false; }
+ @Override
+ public void setPrivileged(boolean privileged) { /* NO-OP */ }
+
+ @Override
+ public ServletContext getServletContext() { return null; }
+
+ @Override
+ public int getSessionTimeout() { return 0; }
+ @Override
+ public void setSessionTimeout(int timeout) { /* NO-OP */ }
+
+ @Override
+ public boolean getSwallowAbortedUploads() { return false; }
+ @Override
+ public void setSwallowAbortedUploads(boolean swallowAbortedUploads) { /* NO-OP */ }
+
+ @Override
+ public boolean getSwallowOutput() { return false; }
+ @Override
+ public void setSwallowOutput(boolean swallowOutput) { /* NO-OP */ }
+
+ @Override
+ public String getWrapperClass() { return null; }
+ @Override
+ public void setWrapperClass(String wrapperClass) { /* NO-OP */ }
+
+ @Override
+ public boolean getXmlNamespaceAware() { return false; }
+ @Override
+ public void setXmlNamespaceAware(boolean xmlNamespaceAware) { /* NO-OP */ }
+
+ @Override
+ public boolean getXmlValidation() { return false; }
+ @Override
+ public void setXmlValidation(boolean xmlValidation) { /* NO-OP */ }
+
+ @Override
+ public void setTldValidation(boolean tldValidation) { /* NO-OP */ }
+ @Override
+ public boolean getTldValidation() { return false; }
+
+ @Override
+ public boolean getTldNamespaceAware() { return false; }
+ @Override
+ public void setTldNamespaceAware(boolean tldNamespaceAware) { /* NO-OP */ }
+
+ @Override
+ public JarScanner getJarScanner() { return null; }
+ @Override
+ public void setJarScanner(JarScanner jarScanner) { /* NO-OP */ }
+
+ @Override
+ public Authenticator getAuthenticator() { return null; }
+
+ @Override
+ public void setLogEffectiveWebXml(boolean logEffectiveWebXml) { /* NO-OP */ }
+ @Override
+ public boolean getLogEffectiveWebXml() { return false; }
+
+ @Override
+ public void addApplicationListener(String listener) { /* NO-OP */ }
+ @Override
+ public String[] findApplicationListeners() { return null; }
+ @Override
+ public void removeApplicationListener(String listener) { /* NO-OP */ }
+
+ @Override
+ public void addApplicationParameter(ApplicationParameter parameter) { /* NO-OP */ }
+ @Override
+ public ApplicationParameter[] findApplicationParameters() { return null; }
+ @Override
+ public void removeApplicationParameter(String name) { /* NO-OP */ }
+
+ @Override
+ public void addConstraint(SecurityConstraint constraint) { /* NO-OP */ }
+ @Override
+ public SecurityConstraint[] findConstraints() { return null; }
+ @Override
+ public void removeConstraint(SecurityConstraint constraint) { /* NO-OP */ }
+
+ @Override
+ public void addErrorPage(ErrorPage errorPage) { /* NO-OP */ }
+ @Override
+ public ErrorPage findErrorPage(int errorCode) { return null; }
+ @Override
+ public ErrorPage findErrorPage(String exceptionType) { return null; }
+ @Override
+ public ErrorPage[] findErrorPages() { return null; }
+ @Override
+ public void removeErrorPage(ErrorPage errorPage) { /* NO-OP */ }
+
+ @Override
+ public void addFilterDef(FilterDef filterDef) { /* NO-OP */ }
+ @Override
+ public FilterDef findFilterDef(String filterName) { return null; }
+ @Override
+ public FilterDef[] findFilterDefs() { return null; }
+ @Override
+ public void removeFilterDef(FilterDef filterDef) { /* NO-OP */ }
+
+ @Override
+ public void addFilterMap(FilterMap filterMap) { /* NO-OP */ }
+ @Override
+ public void addFilterMapBefore(FilterMap filterMap) { /* NO-OP */ }
+ @Override
+ public FilterMap[] findFilterMaps() { return null; }
+ @Override
+ public void removeFilterMap(FilterMap filterMap) { /* NO-OP */ }
+
+ @Override
+ public void addInstanceListener(String listener) { /* NO-OP */ }
+ @Override
+ public String[] findInstanceListeners() { return null; }
+ @Override
+ public void removeInstanceListener(String listener) { /* NO-OP */ }
+
+ @Override
+ public void addLocaleEncodingMappingParameter(String locale, String encoding) { /* NO-OP */ }
+
+ @Override
+ public void addMimeMapping(String extension, String mimeType) { /* NO-OP */ }
+ @Override
+ public String findMimeMapping(String extension) { return null; }
+ @Override
+ public String[] findMimeMappings() { return null; }
+ @Override
+ public void removeMimeMapping(String extension) { /* NO-OP */ }
+
+ @Override
+ public void addParameter(String name, String value) { /* NO-OP */ }
+ @Override
+ public String findParameter(String name) { return null; }
+ @Override
+ public String[] findParameters() { return null; }
+ @Override
+ public void removeParameter(String name) { /* NO-OP */ }
+
+ @Override
+ public void addRoleMapping(String role, String link) { /* NO-OP */ }
+ @Override
+ public String findRoleMapping(String role) { return null; }
+ @Override
+ public void removeRoleMapping(String role) { /* NO-OP */ }
+
+ @Override
+ public void addSecurityRole(String role) { /* NO-OP */ }
+ @Override
+ public boolean findSecurityRole(String role) { return false; }
+ @Override
+ public String[] findSecurityRoles() { return null; }
+ @Override
+ public void removeSecurityRole(String role) { /* NO-OP */ }
+
+ @Override
+ public void addServletMapping(String pattern, String name) { /* NO-OP */ }
+ @Override
+ public void addServletMapping(String pattern, String name,
+ boolean jspWildcard) { /* NO-OP */ }
+ @Override
+ public String findServletMapping(String pattern) { return null; }
+ @Override
+ public String[] findServletMappings() { return null; }
+ @Override
+ public void removeServletMapping(String pattern) { /* NO-OP */ }
+
+ @Override
+ public void addWelcomeFile(String name) { /* NO-OP */ }
+ @Override
+ public boolean findWelcomeFile(String name) { return false; }
+ @Override
+ public String[] findWelcomeFiles() { return null; }
+ @Override
+ public void removeWelcomeFile(String name) { /* NO-OP */ }
+
+ @Override
+ public void addWrapperLifecycle(String listener) { /* NO-OP */ }
+ @Override
+ public String[] findWrapperLifecycles() { return null; }
+ @Override
+ public void removeWrapperLifecycle(String listener) { /* NO-OP */ }
+
+ @Override
+ public void addWrapperListener(String listener) { /* NO-OP */ }
+ @Override
+ public String[] findWrapperListeners() { return null; }
+ @Override
+ public void removeWrapperListener(String listener) { /* NO-OP */ }
+
+ @Override
+ public Wrapper createWrapper() { return null; }
+
+ @Override
+ public String findStatusPage(int status) { return null; }
+ @Override
+ public int[] findStatusPages() { return null; }
+
+ @Override
+ public boolean fireRequestInitEvent(ServletRequest request) { return false; }
+ @Override
+ public boolean fireRequestDestroyEvent(ServletRequest request) { return false; }
+
+ @Override
+ public void reload() { /* NO-OP */ }
+
+ @Override
+ public String getRealPath(String path) { return null; }
+
+ @Override
+ public int getEffectiveMajorVersion() { return 0; }
+ @Override
+ public void setEffectiveMajorVersion(int major) { /* NO-OP */ }
+
+ @Override
+ public int getEffectiveMinorVersion() { return 0; }
+ @Override
+ public void setEffectiveMinorVersion(int minor) { /* NO-OP */ }
+
+ @Override
+ public JspConfigDescriptor getJspConfigDescriptor() { return null; }
+
+ @Override
+ public void addResourceJarUrl(URL url) { /* NO-OP */ }
+
+ @Override
+ public void addServletContainerInitializer(ServletContainerInitializer sci,
+ Set<Class<?>> classes) { /* NO-OP */ }
+
+ @Override
+ public boolean getPaused() { return false; }
+
+ @Override
+ public boolean isServlet22() { return false; }
+
+ @Override
+ public Set<String> addServletSecurity(
+ ApplicationServletRegistration registration,
+ ServletSecurityElement servletSecurityElement) { return null; }
+
+ @Override
+ public void setResourceOnlyServlets(String resourceOnlyServlets) { /* NO-OP */ }
+ @Override
+ public String getResourceOnlyServlets() { return null; }
+ @Override
+ public boolean isResourceOnlyServlet(String servletName) { return false; }
+
+ @Override
+ public String getBaseName() { return null; }
+
+ @Override
+ public void setFireRequestListenersOnForwards(boolean enable) { /* NO-OP */ }
+ @Override
+ public boolean getFireRequestListenersOnForwards() { return false; }
+
+ @Override
+ public void setPreemptiveAuthentication(boolean enable) { /* NO-OP */ }
+ @Override
+ public boolean getPreemptiveAuthentication() { return false; }
+
+ @Override
+ public void setSendRedirectBody(boolean enable) { /* NO-OP */ }
+ @Override
+ public boolean getSendRedirectBody() { return false; }
+
+ @SuppressWarnings("unused")
+ public synchronized void addValve(Valve valve) { /* NO-OP */ }
+
+ @Override
+ public String getInfo() { return null; }
+
+ @Override
+ public Object getMappingObject() { return null; }
+}
\ No newline at end of file
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
------------------------------------------------------------------------------
svn:eol-style = native
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=1201928&r1=1201927&r2=1201928&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 14 22:07:08 2011
@@ -594,16 +594,18 @@ public class HostConfig
}
Context context = null;
+ boolean isExternalWar = false;
+ boolean isExternal = false;
+ File expandedDocBase = null;
try {
synchronized (digester) {
try {
context = (Context) digester.parse(contextXml);
- if (context == null) {
- log.error(sm.getString(
- "hostConfig.deployDescriptor.error",
- contextXml.getAbsolutePath()));
- return;
- }
+ } catch (Exception e) {
+ log.error(sm.getString(
+ "hostConfig.deployDescriptor.error",
+ contextXml.getAbsolutePath()));
+ context = new FailedContext();
} finally {
digester.reset();
}
@@ -619,8 +621,6 @@ public class HostConfig
context.setPath(cn.getPath());
context.setWebappVersion(cn.getVersion());
// Add the associated docBase to the redeployed list if it's a WAR
- boolean isExternalWar = false;
- boolean isExternal = false;
if (context.getDocBase() != null) {
File docBase = new File(context.getDocBase());
if (!docBase.isAbsolute()) {
@@ -645,12 +645,18 @@ public class HostConfig
context.setDocBase(null);
}
}
+
host.addChild(context);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ log.error(sm.getString("hostConfig.deployDescriptor.error",
+ contextXml.getAbsolutePath()), t);
+ } finally {
// Get paths for WAR and expanded WAR in appBase
// default to appBase dir + name
- File expandedDocBase = new File(appBase(), cn.getBaseName());
- if (context.getDocBase() != null) {
+ expandedDocBase = new File(appBase(), cn.getBaseName());
+ if (context != null && context.getDocBase() != null) {
// first assume docBase is absolute
expandedDocBase = new File(context.getDocBase());
if (!expandedDocBase.isAbsolute()) {
@@ -658,6 +664,7 @@ public class HostConfig
expandedDocBase = new File(appBase(), context.getDocBase());
}
}
+
// Add the eventual unpacked WAR and all the resources which will be
// watched inside it
if (isExternalWar && unpackWARs) {
@@ -690,10 +697,9 @@ public class HostConfig
Long.valueOf(contextXml.lastModified()));
}
}
- } catch (Throwable t) {
- ExceptionUtils.handleThrowable(t);
- log.error(sm.getString("hostConfig.deployDescriptor.error",
- contextXml.getAbsolutePath()), t);
+ // Add the global redeploy resources (which are never deleted) at
+ // the end so they don't interfere with the deletion process
+ addGlobalRedeployResources(deployedApp);
}
if (context != null && host.findChild(context.getName()) != null) {
@@ -872,18 +878,17 @@ public class HostConfig
log.info(sm.getString("hostConfig.deployWar",
war.getAbsolutePath()));
+ Context context = null;
try {
- Context context = null;
if (deployXML && xml.exists()) {
synchronized (digester) {
try {
context = (Context) digester.parse(xml);
- if (context == null) {
- log.error(sm.getString(
- "hostConfig.deployDescriptor.error",
- war.getAbsolutePath()));
- return;
- }
+ } catch (Exception e) {
+ log.error(sm.getString(
+ "hostConfig.deployDescriptor.error",
+ war.getAbsolutePath()));
+ context = new FailedContext();
} finally {
digester.reset();
}
@@ -897,17 +902,17 @@ public class HostConfig
jar.getJarEntry(Constants.ApplicationContextXml);
istream = jar.getInputStream(entry);
context = (Context) digester.parse(istream);
-
+ } catch (Exception e) {
+ log.error(sm.getString(
+ "hostConfig.deployDescriptor.error",
+ war.getAbsolutePath()));
+ } finally {
if (context == null) {
- log.error(sm.getString(
- "hostConfig.deployDescriptor.error",
- war.getAbsolutePath()));
- return;
+ context = new FailedContext();
}
context.setConfigFile(new URL("jar:" +
war.toURI().toString() + "!/" +
Constants.ApplicationContextXml));
- } finally {
if (istream != null) {
try {
istream.close();
@@ -951,9 +956,14 @@ public class HostConfig
context.setWebappVersion(cn.getVersion());
context.setDocBase(cn.getBaseName() + ".war");
host.addChild(context);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ log.error(sm.getString("hostConfig.deployWar.error",
+ war.getAbsolutePath()), t);
+ } finally {
// If we're unpacking WARs, the docBase will be mutated after
// starting the context
- if (unpackWARs && (context.getDocBase() != null)) {
+ if (unpackWARs && context != null && context.getDocBase() != null) {
File docBase = new File(appBase(), cn.getBaseName());
deployedApp.redeployResources.put(docBase.getAbsolutePath(),
Long.valueOf(docBase.lastModified()));
@@ -966,10 +976,9 @@ public class HostConfig
} else {
addWatchedResources(deployedApp, null, context);
}
- } catch (Throwable t) {
- ExceptionUtils.handleThrowable(t);
- log.error(sm.getString("hostConfig.deployWar.error",
- war.getAbsolutePath()), t);
+ // Add the global redeploy resources (which are never deleted) at
+ // the end so they don't interfere with the deletion process
+ addGlobalRedeployResources(deployedApp);
}
deployed.put(cn.getName(), deployedApp);
@@ -1027,20 +1036,20 @@ public class HostConfig
if( log.isInfoEnabled() )
log.info(sm.getString("hostConfig.deployDir",
dir.getAbsolutePath()));
+
+ Context context = null;
+ File xml = new File(dir, Constants.ApplicationContextXml);
+ File xmlCopy = null;
try {
- Context context = null;
- File xml = new File(dir, Constants.ApplicationContextXml);
- File xmlCopy = null;
if (deployXML && xml.exists()) {
synchronized (digester) {
try {
context = (Context) digester.parse(xml);
- if (context == null) {
- log.error(sm.getString(
- "hostConfig.deployDescriptor.error",
- xml));
- return;
- }
+ } catch (Exception e) {
+ log.error(sm.getString(
+ "hostConfig.deployDescriptor.error",
+ xml));
+ context = new FailedContext();
} finally {
digester.reset();
}
@@ -1084,6 +1093,11 @@ public class HostConfig
context.setWebappVersion(cn.getVersion());
context.setDocBase(cn.getBaseName());
host.addChild(context);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ log.error(sm.getString("hostConfig.deployDir.error",
+ dir.getAbsolutePath()), t);
+ } finally {
deployedApp.redeployResources.put(dir.getAbsolutePath(),
Long.valueOf(dir.lastModified()));
if (deployXML && xml.exists()) {
@@ -1098,10 +1112,9 @@ public class HostConfig
}
}
addWatchedResources(deployedApp, dir.getAbsolutePath(), context);
- } catch (Throwable t) {
- ExceptionUtils.handleThrowable(t);
- log.error(sm.getString("hostConfig.deployDir.error",
- dir.getAbsolutePath()), t);
+ // Add the global redeploy resources (which are never deleted) at
+ // the end so they don't interfere with the deletion process
+ addGlobalRedeployResources(deployedApp);
}
deployed.put(cn.getName(), deployedApp);
@@ -1159,6 +1172,25 @@ public class HostConfig
}
+ protected void addGlobalRedeployResources(DeployedApplication app) {
+ // Redeploy resources processing is hard-coded to never delete this file
+ File hostContextXml =
+ new File(getConfigBaseName(), Constants.HostContextXml);
+ if (hostContextXml.isFile()) {
+ app.redeployResources.put(hostContextXml.getAbsolutePath(),
+ Long.valueOf(hostContextXml.lastModified()));
+ }
+
+ // Redeploy resources in CATALINA_BASE/conf are never deleted
+ File globalContextXml =
+ returnCanonicalPath(Constants.DefaultContextXml);
+ if (globalContextXml.isFile()) {
+ app.redeployResources.put(globalContextXml.getAbsolutePath(),
+ Long.valueOf(globalContextXml.lastModified()));
+ }
+ }
+
+
/**
* Check resources for redeployment and reloading.
*/
@@ -1191,6 +1223,13 @@ public class HostConfig
try {
File current = new File(resources[j]);
current = current.getCanonicalFile();
+ // Never delete per host context.xml defaults
+ if (Constants.HostContextXml.equals(
+ current.getName())) {
+ continue;
+ }
+ // Only delete resources in the appBase or the
+ // host's configBase
if ((current.getAbsolutePath().startsWith(
appBase().getAbsolutePath() +
File.separator))
@@ -1241,6 +1280,13 @@ public class HostConfig
try {
File current = new File(resources[j]);
current = current.getCanonicalFile();
+ // Never delete per host context.xml defaults
+ if (Constants.HostContextXml.equals(
+ current.getName())) {
+ continue;
+ }
+ // Only delete resources in the appBase or the host's
+ // configBase
if ((current.getAbsolutePath().startsWith(
appBase().getAbsolutePath() + File.separator))
|| (current.getAbsolutePath().startsWith(
@@ -1262,6 +1308,13 @@ public class HostConfig
try {
File current = new File(resources2[j]);
current = current.getCanonicalFile();
+ // Never delete per host context.xml defaults
+ if (Constants.HostContextXml.equals(
+ current.getName())) {
+ continue;
+ }
+ // Only delete resources in the appBase or the host's
+ // configBase
if ((current.getAbsolutePath().startsWith(
appBase().getAbsolutePath() + File.separator))
|| ((current.getAbsolutePath().startsWith(
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1201928&r1=1201927&r2=1201928&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties Mon Nov 14 22:07:08 2011
@@ -74,6 +74,7 @@ expandWar.createFailed=Unable to create
expandWar.deleteFailed=[{0}] could not be completely deleted. The presence of the remaining files may cause problems
expandWar.illegalPath=The archive [{0}] is malformed and will be ignored: an entry contains an illegal path [{1}] which was not expanded to [{2}] since that is outside of the defined docBase [{3}]
expandWar.missingJarEntry=Cannot get input stream for JarEntry "{0}" - broken WAR file?
+failedContext.start=Failed to process either the global, per-host or context-specific context.xml file therefore the [{0}] Context cannot be started.
hostConfig.appBase=Application base [{1}] for host [{0}] does not exist or is not a directory. deployOnStartUp and autoDeploy have been set to false to prevent deployment errors. Other errors may still occur.
hostConfig.canonicalizing=Error delete redeploy resources from context [{0}]
hostConfig.cce=Lifecycle event data object {0} is not a Host
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/LifecycleBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/LifecycleBase.java?rev=1201928&r1=1201927&r2=1201928&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/LifecycleBase.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/LifecycleBase.java Mon Nov 14 22:07:08 2011
@@ -137,6 +137,8 @@ public abstract class LifecycleBase impl
if (state.equals(LifecycleState.NEW)) {
init();
+ } else if (state.equals(LifecycleState.FAILED)){
+ stop();
} else if (!state.equals(LifecycleState.INITIALIZED) &&
!state.equals(LifecycleState.STOPPED)) {
invalidTransition(Lifecycle.BEFORE_START_EVENT);
@@ -264,6 +266,16 @@ public abstract class LifecycleBase impl
@Override
public final synchronized void destroy() throws LifecycleException {
+ if (LifecycleState.FAILED.equals(state)) {
+ try {
+ // Triggers clean-up
+ stop();
+ } catch (LifecycleException e) {
+ // Just log. Still want to destroy.
+ log.warn(sm.getString("lifecycleBase.destroyStopFail"), e);
+ }
+ }
+
if (LifecycleState.DESTROYING.equals(state) ||
LifecycleState.DESTROYED.equals(state)) {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties?rev=1201928&r1=1201927&r2=1201928&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties Mon Nov 14 22:07:08 2011
@@ -26,6 +26,7 @@ lifecycleBase.alreadyDestroyed=The destr
lifecycleBase.alreadyStarted=The start() method was called on component [{0}] after start() had already been called. The second call will be ignored.
lifecycleBase.alreadyStopped=The stop() method was called on component [{0}] after stop() had already been called. The second call will be ignored.
lifecycleBase.destroyFail=Failed to destroy component [{0}]
+lifecycleBase.destroyStopFail=Calling stop() on failed component [{0}] to trigger clean-up did not complete.
lifecycleBase.initFail=Failed to initialize component [{0}]
lifecycleBase.initMBeanFail=Failed to register component [{0}] with MBean name [{1}]
lifecycleBase.invalidTransition=An invalid Lifecycle transition was attempted ([{0}]) for component [{1}] in state [{2}]
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1201928&r1=1201927&r2=1201928&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Nov 14 22:07:08 2011
@@ -213,6 +213,18 @@
<code>InvocationTargetException</code>. Rethrow fatal errors that must
be rethrown. (kkolinko)
</fix>
+ <fix>
+ Improve handling of failed web application deployments during automatic
+ deployment. Once deployment of a web application fails in one form (e.g.
+ WAR), no further attempt (e.g. directory) will be made to deploy that
+ web application. The base Lifecycle implementation has been improved to
+ allow failed web applications to be started once the configuration
+ issues have been resolved. Any changes to a context.xml file (global,
+ per host or web application specific) will now result in a redeploy
+ of the affected web application(s) that ensures that any changes are
+ correctly applied rather than a reload which ignores changes in
+ context.xml files. (markt/kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
Modified: tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml?rev=1201928&r1=1201927&r2=1201928&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml Mon Nov 14 22:07:08 2011
@@ -195,12 +195,18 @@
will be simply redeployed as a compressed archive.
</li>
<li>
- Re-deployment of a web application if the /WEB-INF/web.xml file (or any
- other resource defined as a WatchedResource) is updated.
+ Re-loading of a web application if the /WEB-INF/web.xml file (or
+ any other resource defined as a WatchedResource) is updated.
</li>
<li>
- Re-deployment of a web application if the Context Descriptor file from which
- the web application has been deployed is updated.
+ Re-deployment of a web application if the Context Descriptor
+ file from which the web application has been deployed is
+ updated.
+ </li>
+ <li>
+ Re-deployment of dependent web applications if the global or
+ per-host Context Descriptor file used by the web application is
+ updated.
</li>
<li>
Re-deployment of a web application if a Context Descriptor file (with a
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org