tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager LocalStrings.properties ManagerServlet.java
Date Mon, 03 Jan 2005 16:09:26 GMT
remm        2005/01/03 08:09:26

  Modified:    webapps/manager/WEB-INF/classes/org/apache/catalina/manager
                        LocalStrings.properties ManagerServlet.java
  Log:
  - 32777: Fail if application isn't configured properly.
  - Submitted by Gabriele Garuglieri.
  
  Revision  Changes    Path
  1.6       +1 -0      jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LocalStrings.properties	2 Sep 2004 19:13:38 -0000	1.5
  +++ LocalStrings.properties	3 Jan 2005 16:09:26 -0000	1.6
  @@ -40,6 +40,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.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}
   managerServlet.invalidPath=FAIL - Invalid context path {0} was specified
  
  
  
  1.26      +10 -5     jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
  
  Index: ManagerServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ManagerServlet.java	16 Dec 2004 15:49:36 -0000	1.25
  +++ ManagerServlet.java	3 Jan 2005 16:09:26 -0000	1.26
  @@ -645,7 +645,7 @@
           }
           
           context = (Context) host.findChild(path);
  -        if (context != null) {
  +        if (context != null && context.getConfigured()) {
               writer.println(sm.getString("managerServlet.deployed", displayPath));
           } else {
               // Something failed
  @@ -711,7 +711,7 @@
           }
           
           context = (Context) host.findChild(path);
  -        if (context != null) {
  +        if (context != null && context.getConfigured()) {
               writer.println(sm.getString("managerServlet.deployed", displayPath));
           } else {
               // Something failed
  @@ -815,8 +815,13 @@
                       removeServiced(path);
                   }
               }
  -            writer.println(sm.getString("managerServlet.deployed",
  -                    displayPath));
  +            context = (Context) host.findChild(path);
  +            if (context != null && context.getConfigured()) {
  +                writer.println(sm.getString("managerServlet.deployed", displayPath));
  +            } else {
  +                // Something failed
  +                writer.println(sm.getString("managerServlet.deployFailed", displayPath));
  +            }
           } catch (Throwable t) {
               log("ManagerServlet.install[" + displayPath + "]", t);
               writer.println(sm.getString("managerServlet.exception",
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message