Author: markt Date: Wed Apr 15 22:52:51 2009 New Revision: 765411 URL: http://svn.apache.org/viewvc?rev=765411&view=rev Log: Update docs in light of https://issues.apache.org/bugzilla/show_bug.cgi?id=46924
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=765411&r1=765410&r2=765411&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Apr 15 22:52:51 2009 @@ -77,6 +77,10 @@ <fix> <bug>46807</bug>: Correct docs for configuration of tag pooling. (markt) </fix> + <fix> + <bug>46924</bug>: Clarify behaviour when auto deployment is enabled and + a WAR, directory or context file is deleted or updated. (markt) + </fix> </changelog> </subsection> <subsection name="Other"> Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml?rev=765411&r1=765410&r2=765411&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml Wed Apr 15 22:52:51 2009 @@ -313,13 +313,34 @@ auto deployer will also track web applications for the following changes: <ul> <li>An update to the WEB-INF/web.xml file will trigger a reload of the - web application</li> - <li>An update to a WAR which has been expanded will trigger - an undeploy (<strong>with a removal of the expanded webapp</strong>), - followed by a deployment</li> - <li>An update to a XML configuration file will trigger an undeploy - (without the removal of any expanded directory), followed by - a deployment of the associated web application</li> + web application</li> + <li>Deleting a WAR file will trigger an undeploy of the application with + the removal of any associated expanded directory, context file and + work directory. Any current user sessions will not be persisted.</li> + <li>Deleting a directory will trigger an undeploy of the application + with the removal of any associated context file and work directory. + Any current user sessions will not be persisted. If there is an + associated WAR file, it will not be deleted and the application will + be redeployed from the WAR file the next time the auto deployer checks + for changes.</li> + <li>Deleting a context file will trigger an undeploy of the application + with the removal of any associated work directory. Any current user + sessions will not be persisted. If there is an associated WAR file + and/or directory, they will not be deleted and the application will be + redeployed from the WAR file (or from directory if there is no WAR + file) the next time the auto deployer checks for changes.</li> + <li>Updating a WAR file will trigger an undeploy of the application with + the removal of any associated expanded directory, context file and + work directory. Any current user sessions will not be persisted.</li> + <li>Updating a directory (not the directory contents) will trigger an + undeploy of the application with the removal of any associated context + file and work directory. Any current user sessions will not be + persisted. The application will be redeployed the next time the auto + deployer checks for changes.</li> + <li>Updating a context file will trigger an undeploy of the application + with the removal of any associated work directory. Any current user + sessions will not be persisted. The application will be redeployed the + next time the auto deployer checks for changes.</li> </ul> </p> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org