[jboss-cvs] contrib/jetty/src/main/org/mortbay/jetty/servlet/jmx ServletHolderMBean.java HolderMBean.java FilterHolderMBean.java WebApplicationHandlerMBean.java ServletHandlerMBean.java

[Jules G. <jul...@us...>]

  User: jules_gosnell
  Date: 03/02/15 15:23:35

  Modified:    jetty/src/main/org/mortbay/jetty/servlet/jmx Tag: Branch_3_2
                        WebApplicationHandlerMBean.java
                        ServletHandlerMBean.java
  Added:       jetty/src/main/org/mortbay/jetty/servlet/jmx Tag: Branch_3_2
                        ServletHolderMBean.java HolderMBean.java
                        FilterHolderMBean.java
  Log:
  more on the JSR77 integration
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.3   +8 -9      contrib/jetty/src/main/org/mortbay/jetty/servlet/jmx/WebApplicationHandlerMBean.java
  
  Index: WebApplicationHandlerMBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/jmx/WebApplicationHandlerMBean.java,v
  retrieving revision 1.1.4.2
  retrieving revision 1.1.4.3
  diff -u -r1.1.4.2 -r1.1.4.3
  --- WebApplicationHandlerMBean.java	12 Feb 2003 01:10:35 -0000	1.1.4.2
  +++ WebApplicationHandlerMBean.java	15 Feb 2003 23:23:35 -0000	1.1.4.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 2002 Mort Bay Consulting (Australia) Pty. Ltd.
  -// $Id: WebApplicationHandlerMBean.java,v 1.1.4.2 2003/02/12 01:10:35 jules_gosnell Exp $
  +// $Id: WebApplicationHandlerMBean.java,v 1.1.4.3 2003/02/15 23:23:35 jules_gosnell Exp $
   // ========================================================================
   
   package org.mortbay.jetty.servlet.jmx;
  @@ -9,18 +9,22 @@
   import java.util.List;
   import javax.management.MBeanException;
   import org.mortbay.jetty.servlet.WebApplicationHandler;
  +import javax.management.ObjectName;
  +import java.util.HashMap;
  +import java.util.Map;
   
   
   /* ------------------------------------------------------------ */
   /** 
    *
  - * @version $Revision: 1.1.4.2 $
  + * @version $Revision: 1.1.4.3 $
    * @author Greg Wilkins (gregw)
    */
   public class WebApplicationHandlerMBean extends ServletHandlerMBean
   {
       /* ------------------------------------------------------------ */
       private WebApplicationHandler _webappHandler;
  +    private Map _filters = new HashMap();
       
       /* ------------------------------------------------------------ */
       /** Constructor. 
  @@ -40,14 +44,9 @@
       }
   
       /* ------------------------------------------------------------ */
  -    public String[] getFilters()
  +    public ObjectName[] getFilters()
       {
           List l=_webappHandler.getFilters();
  -        String[] s = new String[l.size()];
  -        int i=0;
  -        Iterator iter = l.iterator();    
  -        while(iter.hasNext())
  -            s[i++]=iter.next().toString();
  -        return s;
  +        return getComponentMBeans(l.toArray(),_filters);  
       }
   }
  
  
  
  1.1.4.3   +5 -14     contrib/jetty/src/main/org/mortbay/jetty/servlet/jmx/ServletHandlerMBean.java
  
  Index: ServletHandlerMBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/jmx/ServletHandlerMBean.java,v
  retrieving revision 1.1.4.2
  retrieving revision 1.1.4.3
  diff -u -r1.1.4.2 -r1.1.4.3
  --- ServletHandlerMBean.java	22 Jan 2003 00:29:55 -0000	1.1.4.2
  +++ ServletHandlerMBean.java	15 Feb 2003 23:23:35 -0000	1.1.4.3
  @@ -1,6 +1,6 @@
   // ========================================================================
   // Copyright (c) 2002,2003 Mort Bay Consulting (Australia) Pty. Ltd.
  -// $Id: ServletHandlerMBean.java,v 1.1.4.2 2003/01/22 00:29:55 jules_gosnell Exp $
  +// $Id: ServletHandlerMBean.java,v 1.1.4.3 2003/02/15 23:23:35 jules_gosnell Exp $
   // ========================================================================
   
   package org.mortbay.jetty.servlet.jmx;
  @@ -18,7 +18,7 @@
   /* ------------------------------------------------------------ */
   /** 
    *
  - * @version $Revision: 1.1.4.2 $
  + * @version $Revision: 1.1.4.3 $
    * @author Greg Wilkins (gregw)
    */
   public class ServletHandlerMBean extends HttpHandlerMBean  
  @@ -53,21 +53,12 @@
           ObjectName[] on=getComponentMBeans(new Object[]{sm},null);
           return on[0];
       }
  +
       
       /* ------------------------------------------------------------ */
  -    public String[] getServlets()
  +    public ObjectName[] getServlets()
       {
  -        PathMap sm = _servletHandler.getServletMap();
  -        String[] s = new String[sm.size()];
  -        int i=0;
  -        Iterator iter = sm.entrySet().iterator();
  -        while(iter.hasNext())
  -        {
  -            Map.Entry entry = (Map.Entry)iter.next();
  -            s[i++]=entry.toString();
  -        }
  -        
  -        return s;
  +        return getComponentMBeans(_servletHandler.getServlets(),null);   
       }
       
       /* ------------------------------------------------------------ */
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +45 -0     contrib/jetty/src/main/org/mortbay/jetty/servlet/jmx/Attic/ServletHolderMBean.java
  
  
  
  
  1.1.2.1   +73 -0     contrib/jetty/src/main/org/mortbay/jetty/servlet/jmx/Attic/HolderMBean.java
  
  
  
  
  1.1.2.1   +46 -0     contrib/jetty/src/main/org/mortbay/jetty/servlet/jmx/Attic/FilterHolderMBean.java