remm        2003/06/22 10:32:44

  Modified:    webapps/manager/WEB-INF web.xml
               webapps/manager/WEB-INF/classes/org/apache/catalina/manager
                        StatusManagerServlet.java
  Log:
  - Add placeholder code for a complete status display (including webapps stats).
  
  Revision  Changes    Path
  1.9       +2 -2      jakarta-tomcat-catalina/webapps/manager/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/web.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- web.xml   12 Apr 2003 14:17:19 -0000      1.8
  +++ web.xml   22 Jun 2003 17:32:44 -0000      1.9
  @@ -99,7 +99,7 @@
     </servlet-mapping>
     <servlet-mapping>
       <servlet-name>Status</servlet-name>
  -    <url-pattern>/status</url-pattern>
  +    <url-pattern>/status/*</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
       <servlet-name>JMXProxy</servlet-name>
  @@ -140,7 +140,7 @@
         <url-pattern>/undeploy</url-pattern>
         <url-pattern>/reload</url-pattern>
         <url-pattern>/serverinfo</url-pattern>
  -      <url-pattern>/status</url-pattern>
  +      <url-pattern>/status/*</url-pattern>
         <url-pattern>/roles</url-pattern>
         <url-pattern>/resources</url-pattern>
       </web-resource-collection>
  
  
  
  1.3       +31 -4     
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java
  
  Index: StatusManagerServlet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StatusManagerServlet.java 26 Mar 2003 11:01:53 -0000      1.2
  +++ StatusManagerServlet.java 22 Jun 2003 17:32:44 -0000      1.3
  @@ -252,6 +252,12 @@
                   writeConnectorState(writer, objectName, name);
               }
   
  +            if ((request.getPathInfo() != null) 
  +                && (request.getPathInfo().equals("/all"))) {
  +                // Warning: slow
  +                writeApplicationsState(writer);
  +            }
  +
           } catch (Exception e) {
               e.printStackTrace();
           }
  @@ -444,6 +450,23 @@
   
   
       /**
  +     * Write applications state.
  +     */
  +    protected void writeApplicationsState(PrintWriter writer)
  +        throws Exception {
  +
  +        ObjectName queryHosts = new ObjectName("*:type=Host,*");
  +        Set hostsON = mBeanServer.queryNames(queryHosts, null);
  +        Iterator iterator = hostsON.iterator();
  +        while (iterator.hasNext()) {
  +            ObjectName hostON = (ObjectName) iterator.next();
  +            System.out.println("Host: " + hostON);
  +        }
  +
  +    }
  +
  +
  +    /**
        * Filter the specified message string for characters that are sensitive
        * in HTML.  This avoids potential attacks caused by including JavaScript
        * codes in the request URL that is often reported in error messages.
  @@ -517,6 +540,10 @@
                       } else if (type.equals("RequestProcessor")) {
                           requestProcessors.removeElement(objectName);
                       }
  +                }
  +                String j2eeType = objectName.getKeyProperty("j2eeType");
  +                if (j2eeType != null) {
  +                    
                   }
               }
           }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to