ejtools-cvs

[Laurent E. <let...@us...>]

Update of /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action
In directory usw-pr-cvs1:/tmp/cvs-serv11980/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action

Modified Files:
	ConnectAction.java DetailAction.java 
Log Message:
Remove the filter

Index: ConnectAction.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action/ConnectAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConnectAction.java	15 May 2002 20:56:32 -0000	1.1
--- ConnectAction.java	17 May 2002 07:21:44 -0000	1.2
***************
*** 10,17 ****
  import java.util.Locale;
  
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
- import javax.servlet.http.HttpSession;
  
  import net.sourceforge.ejtools.jmxbrowser.web.Constants;
--- 10,17 ----
  import java.util.Locale;
  
+ import javax.servlet.ServletContext;
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
  
  import net.sourceforge.ejtools.jmxbrowser.web.Constants;
***************
*** 74,104 ****
        }
  
!       HttpSession session = request.getSession();
!       tree = (JMXTree) session.getAttribute(Constants.TREE);
! 
!       System.out.println("perform session " + session.getId());
  
        if (tree == null)
        {
           tree = new JMXTree();
!          session.setAttribute(Constants.TREE, tree);
        }
  
        tree.connect();
  
-       // Remove the obsolete form bean
-       /*
-        * if (mapping.getAttribute() != null)
-        * {
-        * if ("request".equals(mapping.getScope()))
-        * {
-        * request.removeAttribute(mapping.getAttribute());
-        * }
-        * else
-        * {
-        * session.removeAttribute(mapping.getAttribute());
-        * }
-        * }
-        */
        return (mapping.findForward("view"));
     }
--- 74,88 ----
        }
  
!       ServletContext context = this.getServlet().getServletContext();
!       tree = (JMXTree) context.getAttribute(Constants.TREE);
  
        if (tree == null)
        {
           tree = new JMXTree();
!          context.setAttribute(Constants.TREE, tree);
        }
  
        tree.connect();
  
        return (mapping.findForward("view"));
     }

Index: DetailAction.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jmx.browser/src/main/net/sourceforge/ejtools/jmxbrowser/web/action/DetailAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DetailAction.java	15 May 2002 20:56:32 -0000	1.3
--- DetailAction.java	17 May 2002 07:21:44 -0000	1.4
***************
*** 10,13 ****
--- 10,14 ----
  import java.util.Locale;
  
+ import javax.servlet.ServletContext;
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServletRequest;
***************
*** 70,86 ****
        System.out.println("REF " + ref);
  
!       HttpSession session = request.getSession();
!       System.out.println("perform session " + session.getId());
!       System.out.println("Session " + session);
  
!       JMXTree root = (JMXTree) session.getAttribute(Constants.TREE);
!       System.out.println("Root " + root);
!       Resource o = (Resource) root.searchObjectName(ref);
  
        if (o != null)
        {
!          session.setAttribute(Constants.DETAIL, o);
           System.out.println("Object " + o);
!          session.setAttribute(Constants.DETAIL_INFO, o.getMBeanInfo());
           System.out.println("Object " + o.getMBeanInfo());
  
--- 71,85 ----
        System.out.println("REF " + ref);
  
!       ServletContext context = this.getServlet().getServletContext();
!       JMXTree tree = (JMXTree) context.getAttribute(Constants.TREE);
  
!       System.out.println("Root " + tree);
!       Resource o = (Resource) tree.searchObjectName(ref);
  
        if (o != null)
        {
!          context.setAttribute(Constants.DETAIL, o);
           System.out.println("Object " + o);
!          context.setAttribute(Constants.DETAIL_INFO, o.getMBeanInfo());
           System.out.println("Object " + o.getMBeanInfo());