Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 53262 invoked from network); 5 Jan 2009 18:34:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Jan 2009 18:34:53 -0000 Received: (qmail 70440 invoked by uid 500); 5 Jan 2009 18:34:49 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 70385 invoked by uid 500); 5 Jan 2009 18:34:49 -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 70374 invoked by uid 99); 5 Jan 2009 18:34:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jan 2009 10:34:49 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jan 2009 18:34:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5A9BC2388970; Mon, 5 Jan 2009 10:34:26 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r731644 - in /tomcat/trunk/java/org/apache/catalina/manager: LocalStrings.properties ManagerServlet.java Date: Mon, 05 Jan 2009 18:34:25 -0000 To: dev@tomcat.apache.org From: fhanik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090105183426.5A9BC2388970@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fhanik Date: Mon Jan 5 10:34:25 2009 New Revision: 731644 URL: http://svn.apache.org/viewvc?rev=731644&view=rev Log: When deployment succeeds but the context still fails to start, provide instant feedback Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=731644&r1=731643&r2=731644&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties Mon Jan 5 10:34:25 2009 @@ -60,6 +60,7 @@ managerServlet.configured=OK - Deployed application from context file {0} managerServlet.deployed=OK - Deployed application at context path {0} managerServlet.deployFailed=FAIL - Failed to deploy application at context path {0} +managerServlet.deployedButNotStarted=FAIL - Deployed application at context path {0} but context failed to start managerServlet.exception=FAIL - Encountered exception {0} managerServlet.deployed=OK - Deployed application at context path {0} managerServlet.invalidPath=FAIL - Invalid context path {0} was specified Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=731644&r1=731643&r2=731644&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Mon Jan 5 10:34:25 2009 @@ -801,8 +801,10 @@ } } context = (Context) host.findChild(path); - if (context != null && context.getConfigured()) { + if (context != null && context.getConfigured() && context.getAvailable()) { writer.println(sm.getString("managerServlet.deployed", displayPath)); + } else if (context!=null && !context.getAvailable()) { + writer.println(sm.getString("managerServlet.deployedButNotStarted", displayPath)); } else { // Something failed writer.println(sm.getString("managerServlet.deployFailed", displayPath)); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org