From dev-return-121617-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org Thu Nov 3 23:03:25 2011 Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5B81175B6 for ; Thu, 3 Nov 2011 23:03:25 +0000 (UTC) Received: (qmail 12755 invoked by uid 500); 3 Nov 2011 23:03:24 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 12696 invoked by uid 500); 3 Nov 2011 23:03:24 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 12686 invoked by uid 99); 3 Nov 2011 23:03:24 -0000 Received: from minotaur.apache.org (HELO minotaur.apache.org) (140.211.11.9) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Nov 2011 23:03:24 +0000 Received: from localhost (HELO [192.168.23.9]) (127.0.0.1) (smtp-auth username markt, mechanism plain) by minotaur.apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Nov 2011 23:03:24 +0000 Message-ID: <4EB31DB2.5000102@apache.org> Date: Thu, 03 Nov 2011 23:03:14 +0000 From: Mark Thomas User-Agent: Mozilla/5.0 (Windows NT 5.2; WOW64; rv:7.0.1) Gecko/20110929 Thunderbird/7.0.1 MIME-Version: 1.0 To: Tomcat Developers List Subject: Re: Redeploy on context.xml changes (Was: Tagging 7.0.23) References: <4EB2CA73.6080908@apache.org> In-Reply-To: <4EB2CA73.6080908@apache.org> X-Enigmail-Version: 1.3.2 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 03/11/2011 17:08, Mark Thomas wrote: > I'm still looking at: > - recovery after fixing the broken file > - not deploying an expanded dir if the context.xml in > conf/Catalina/localhost is broken. OK. Here is a patch for review. There are so many combinations deployment and ways to create a dodgy configuration that I have probably missed a couple of edge cases. The main idea with this patch is that a Context always gets added even if deployment fails. That allows fixes via JMX and prevents WAR/directory deployment after a failed descriptor deployment. If the context.xml can't be read, a new FailedContext object is used. This allows redeploy resources to be tracked but the Context cannot be started. A number of clean-up issues I spotted along the way have already been fixed. http://people.apache.org/~markt/patches/2011-11-03-redeploy-trunk-v2.patch Mark --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org