Author: fhanik
Date: Mon Jan 26 18:03:25 2009
New Revision: 737772
URL: http://svn.apache.org/viewvc?rev=737772&view=rev
Log:
Manager application reports FAIL if application didn't start successfully
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=737772&r1=737771&r2=737772&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 26 18:03:25 2009
@@ -164,11 +164,6 @@
+1: markt, remm, fhanik
-1:
-* Provide deployment feedback - ie when deployment succeeds but startup fails,
it should return FAIL
- http://svn.apache.org/viewvc?rev=731644&view=rev
- +1: fhanik, funkman, markt, remm
- -1:
-
* Deprecate unused code (with a view to deleting it in TC7
http://svn.apache.org/viewvc?view=rev&revision=719119
http://svn.apache.org/viewvc?view=rev&revision=719124
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=737772&r1=737771&r2=737772&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
Mon Jan 26 18:03:25 2009
@@ -61,6 +61,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/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=737772&r1=737771&r2=737772&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Mon Jan 26 18:03:25 2009
@@ -827,8 +827,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: 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=737772&r1=737771&r2=737772&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jan 26 18:03:25 2009
@@ -35,6 +35,12 @@
<section name="Tomcat 6.0.19 (remm)">
<subsection name="Catalina">
<changelog>
+ <update>
+ Manager application prints FAIL if application was deployed but failed
to start (fhanik)
+ </update>
+ <update>
+ When shutdown port is disabled, print user friendly message and not a
stack trace. (fhanik)
+ </update>
<fix>
<bug>37458</bug>: Correct sync issue that leads to NPE in rare
circumstances. Patch provided by Konstantin Kolinko. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
