tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r731644 - in /tomcat/trunk/java/org/apache/catalina/manager: LocalStrings.properties ManagerServlet.java
Date Mon, 05 Jan 2009 18:34:25 GMT
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


Mime
View raw message