Author: remy.maucherat(a)jboss.com Date: 2009-01-06 11:31:23 -0500 (Tue, 06 Jan 2009) New Revision: 895 Modified: trunk/java/org/apache/catalina/manager/LocalStrings.properties trunk/java/org/apache/catalina/manager/ManagerServlet.java trunk/webapps/docs/changelog.xml Log: - New error message in the manager servlet. Modified: trunk/java/org/apache/catalina/manager/LocalStrings.properties =================================================================== --- trunk/java/org/apache/catalina/manager/LocalStrings.properties 2009-01-06 16:27:33 UTC (rev 894) +++ trunk/java/org/apache/catalina/manager/LocalStrings.properties 2009-01-06 16:31:23 UTC (rev 895) @@ -45,6 +45,7 @@ managerServlet.cannotInvoke=Cannot invoke manager servlet through invoker managerServlet.configured=OK - Deployed application from context file {0} managerServlet.deployed=OK - Deployed application at context path {0} +managerServlet.deployedButNotStarted=FAIL - Deployed application at context path {0} but context failed to start managerServlet.deployFailed=FAIL - Failed to deploy application at context path {0} managerServlet.exception=FAIL - Encountered exception {0} managerServlet.deployed=OK - Deployed application at context path {0} Modified: trunk/java/org/apache/catalina/manager/ManagerServlet.java =================================================================== --- trunk/java/org/apache/catalina/manager/ManagerServlet.java 2009-01-06 16:27:33 UTC (rev 894) +++ trunk/java/org/apache/catalina/manager/ManagerServlet.java 2009-01-06 16:31:23 UTC (rev 895) @@ -819,8 +819,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)); Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2009-01-06 16:27:33 UTC (rev 894) +++ trunk/webapps/docs/changelog.xml 2009-01-06 16:31:23 UTC (rev 895) @@ -199,6 +199,9 @@ <fix> Remove verbose attribute value logging during session passivation. (remm) </fix> + <fix> + Specific error message for webapps that fail to start. (fhanik) + </fix> </changelog> </subsection> <subsection name="Coyote">