[Mc4j-cvs] mc4j/src/org/mc4j/console/mejb MBeanFilterNode.java,1.7,1.8 MEJBChildren.java,1.2,1.3
Brought to you by:
ghinkl
Menu
▾
▴
[Mc4j-cvs] mc4j/src/org/mc4j/console/mejb MBeanFilterNode.java,1.7,1.8 MEJBChildren.java,1.2,1.3
|
From: Greg H. <gh...@us...> - 2006-04-12 19:14:39
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/mejb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20162/src/org/mc4j/console/mejb Modified Files: MBeanFilterNode.java MEJBChildren.java Log Message: Merging EMS into head for the 2.0 release work Index: MBeanFilterNode.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/mejb/MBeanFilterNode.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MBeanFilterNode.java 15 Jan 2005 03:52:15 -0000 1.7 --- MBeanFilterNode.java 12 Apr 2006 19:13:59 -0000 1.8 *************** *** 17,27 **** package org.mc4j.console.mejb; import org.mc4j.console.bean.MBeanNode; - import org.mc4j.console.bean.RefreshAction; - import org.mc4j.console.bean.attribute.AttributeNode; import org.mc4j.console.mejb.view.ShowMEJBViewAction; - import org.mc4j.console.connection.ConnectionNode; - import org.mc4j.console.Refreshable; import org.mc4j.console.util.NodeUtil; import org.openide.nodes.FilterNode; import org.openide.nodes.Node; --- 17,26 ---- package org.mc4j.console.mejb; + import org.mc4j.console.Refreshable; import org.mc4j.console.bean.MBeanNode; import org.mc4j.console.mejb.view.ShowMEJBViewAction; import org.mc4j.console.util.NodeUtil; + import org.mc4j.ems.connection.bean.EmsBeanName; + import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.openide.nodes.FilterNode; import org.openide.nodes.Node; *************** *** 32,50 **** import org.openide.windows.IOProvider; ! import javax.swing.*; import javax.management.j2ee.ListenerRegistration; import javax.management.j2ee.Management; ! import javax.management.ObjectName; ! import javax.management.NotificationListener; ! import javax.management.Notification; ! import javax.management.InstanceNotFoundException; import java.util.HashMap; - import java.util.Map; - import java.util.Hashtable; import java.util.Iterator; - import java.util.ArrayList; import java.util.List; ! import java.awt.*; ! import java.rmi.RemoteException; /** --- 31,45 ---- import org.openide.windows.IOProvider; ! import javax.management.Notification; ! import javax.management.NotificationListener; import javax.management.j2ee.ListenerRegistration; import javax.management.j2ee.Management; ! import java.awt.Image; ! import java.rmi.RemoteException; ! import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; ! import java.util.Map; /** *************** *** 76,87 **** filteredNode = node; ! filteredDisplayName = filteredNode.getObjectName().getKeyProperty("name"); ! filteredDomain = this.filteredNode.getObjectName().getDomain(); ! filteredType = this.filteredNode.getObjectName().getKeyProperty("j2eeType"); //((MBeanFilterNodeChildren) getChildren()).setParentNode(this); ! Hashtable hash = node.getObjectName().getKeyPropertyList(); for (Iterator iterator = hash.entrySet().iterator(); iterator.hasNext();) { Map.Entry entry = (Map.Entry) iterator.next(); --- 71,84 ---- filteredNode = node; ! EmsBeanName name = filteredNode.getEmsBean().getBeanName(); ! ! filteredDisplayName = name.getKeyProperty("name"); ! filteredDomain = name.getDomain(); ! filteredType = name.getKeyProperty("j2eeType"); //((MBeanFilterNodeChildren) getChildren()).setParentNode(this); ! Map<String,String> hash = name.getKeyProperties(); for (Iterator iterator = hash.entrySet().iterator(); iterator.hasNext();) { Map.Entry entry = (Map.Entry) iterator.next(); *************** *** 137,153 **** public void loadMetadata() { ! AttributeNode attributeNode = (AttributeNode) filteredNode.getAttributeNodeMap().get("eventProvider"); ! eventProvider = ((Boolean) attributeNode.getValue()).booleanValue(); ! attributeNode = (AttributeNode) filteredNode.getAttributeNodeMap().get("stateManageable"); ! stateManageable = ((Boolean) attributeNode.getValue()).booleanValue(); ! attributeNode = (AttributeNode) filteredNode.getAttributeNodeMap().get("statisticsProvider"); ! statsProvider = ((Boolean) attributeNode.getValue()).booleanValue(); if (stateManageable) { ! AttributeNode stateAttribute = (AttributeNode) filteredNode.getAttributeNodeMap().get("state"); if (stateAttribute == null) ! stateAttribute = (AttributeNode) filteredNode.getAttributeNodeMap().get("State"); if (stateAttribute != null) { --- 134,150 ---- public void loadMetadata() { ! EmsAttribute attribute = filteredNode.getAttributeNodeMap().get("eventProvider"); ! eventProvider = ((Boolean) attribute.getValue()).booleanValue(); ! attribute = filteredNode.getAttributeNodeMap().get("stateManageable"); ! stateManageable = ((Boolean) attribute.getValue()).booleanValue(); ! attribute = filteredNode.getAttributeNodeMap().get("statisticsProvider"); ! statsProvider = ((Boolean) attribute.getValue()).booleanValue(); if (stateManageable) { ! EmsAttribute stateAttribute = filteredNode.getAttributeNodeMap().get("state"); if (stateAttribute == null) ! stateAttribute = filteredNode.getAttributeNodeMap().get("State"); if (stateAttribute != null) { *************** *** 186,190 **** /* register an event listener */ IOProvider.getDefault().getStdOut().println( ! "addNotificationListener( " + this + " ) to " + filteredNode.getObjectName()); Object managementObject = filteredNode.getConnectionNode().getMEJB(); --- 183,187 ---- /* register an event listener */ IOProvider.getDefault().getStdOut().println( ! "addNotificationListener( " + this + " ) to " + filteredNode.getEmsBean().getBeanName().getCanonicalName()); Object managementObject = filteredNode.getConnectionNode().getMEJB(); *************** *** 197,203 **** ListenerRegistration lr = mejb.getListenerRegistry(); ! lr.addNotificationListener(filteredNode.getObjectName(), this, null, "MEJB Listener"); ! } catch (InstanceNotFoundException e) { ! e.printStackTrace(); } catch (RemoteException e) { e.printStackTrace(); --- 194,201 ---- ListenerRegistration lr = mejb.getListenerRegistry(); ! // TODO!! use ems notification support ! // lr.addNotificationListener(filteredNode.getObjectName(), this, null, "MEJB Listener"); ! // } catch (InstanceNotFoundException e) { ! // e.printStackTrace(); } catch (RemoteException e) { e.printStackTrace(); *************** *** 212,216 **** IOProvider.getDefault().getStdOut().println( "Got an event (" + notification + ") on: " + ! filteredNode.getObjectName().getCanonicalName()); } --- 210,214 ---- IOProvider.getDefault().getStdOut().println( "Got an event (" + notification + ") on: " + ! filteredNode.getEmsBean().getBeanName().getCanonicalName()); } *************** *** 279,283 **** } protected void performAction(Node[] nodes) { ! filteredNode.getConnectionNode().browseToMBean(filteredNode.getObjectName()); } protected boolean enable(Node[] nodes) { --- 277,281 ---- } protected void performAction(Node[] nodes) { ! filteredNode.getConnectionNode().browseToMBean(filteredNode.getEmsBean().getBeanName().getCanonicalName()); } protected boolean enable(Node[] nodes) { Index: MEJBChildren.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/mejb/MEJBChildren.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MEJBChildren.java 30 Nov 2004 03:38:43 -0000 1.2 --- MEJBChildren.java 12 Apr 2006 19:13:59 -0000 1.3 *************** *** 19,32 **** import org.mc4j.console.bean.MBeanNode; import org.mc4j.console.connection.ConnectionNode; import org.openide.nodes.Children; import org.openide.nodes.Node; - import org.openide.windows.IOProvider; - import javax.management.MBeanServer; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; - import java.util.Hashtable; /** --- 19,30 ---- import org.mc4j.console.bean.MBeanNode; import org.mc4j.console.connection.ConnectionNode; + import org.mc4j.ems.connection.EmsConnection; import org.openide.nodes.Children; import org.openide.nodes.Node; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; /** *************** *** 37,40 **** --- 35,39 ---- private ConnectionNode connectionNode; + private EmsConnection connection; private String parentType; private String parentName; *************** *** 45,48 **** --- 44,48 ---- public MEJBChildren(ConnectionNode connectionNode, MEJBNodeLayer parentNode) { this.connectionNode = connectionNode; + this.connection = connectionNode.getEmsConnection(); setFilteredNode(parentNode); } *************** *** 82,86 **** java.util.Map parentKeys = null; ! java.util.Map keys = null; if (parentNode != null) { parentKeys = parentNode.getKeys(); --- 82,86 ---- java.util.Map parentKeys = null; ! java.util.Map<String, String> keys = null; if (parentNode != null) { parentKeys = parentNode.getKeys(); *************** *** 89,92 **** --- 89,93 ---- } + for (int i = 0; childTypes != null && i < childTypes.length; i++) { String childType = childTypes[i]; *************** *** 96,100 **** AggregateNode aggregateNode = getAggregateNode(childType); - MBeanServer mgmt = connectionNode.getMBeanServer(); List allMBeans = connectionNode.getMBeanList(); --- 97,100 ---- *************** *** 104,114 **** // Check if it matches ! String canName = beanNode.getObjectName().getCanonicalName(); ! Hashtable table = beanNode.getObjectName().getKeyPropertyList(); if (keys != null && keys.size() > 0) { // If there are no keys, there isn't anything to match ! for (Iterator iterator1 = keys.entrySet().iterator(); iterator1.hasNext();) { ! java.util.Map.Entry entry = (java.util.Map.Entry) iterator1.next(); String value = (String) table.get(entry.getKey()); --- 104,113 ---- // Check if it matches ! String canName = beanNode.getEmsBean().getBeanName().getCanonicalName(); ! java.util.Map<String,String> table = beanNode.getEmsBean().getBeanName().getKeyProperties(); if (keys != null && keys.size() > 0) { // If there are no keys, there isn't anything to match ! for (java.util.Map.Entry<String,String> entry : keys.entrySet()) { String value = (String) table.get(entry.getKey()); *************** *** 149,153 **** MBeanNode beanNode = (MBeanNode) iterator.next(); ! String name = beanNode.getObjectName().getKeyProperty("name"); for (int j = 0; j < existingChildren.length; j++) { Node node = existingChildren[j]; --- 148,152 ---- MBeanNode beanNode = (MBeanNode) iterator.next(); ! String name = beanNode.getEmsBean().getBeanName().getKeyProperty("name"); for (int j = 0; j < existingChildren.length; j++) { Node node = existingChildren[j]; *************** *** 170,174 **** for (int j = 0; j < allMBeans.size(); j++) { MBeanNode beanNode = (MBeanNode) allMBeans.get(j); ! if (beanNode.getObjectName().getCanonicalName().indexOf("J2EEServer=none") > 0) { found = true; } --- 169,173 ---- for (int j = 0; j < allMBeans.size(); j++) { MBeanNode beanNode = (MBeanNode) allMBeans.get(j); ! if (beanNode.getEmsBean().getBeanName().getCanonicalName().indexOf("J2EEServer=none") > 0) { found = true; } *************** *** 191,195 **** for (int j = 0; j < allMBeans.size(); j++) { MBeanNode beanNode = (MBeanNode) allMBeans.get(j); ! if (beanNode.getObjectName().getCanonicalName().indexOf("J2EEApplication="+applicationName) > 0) { found = true; } --- 190,194 ---- for (int j = 0; j < allMBeans.size(); j++) { MBeanNode beanNode = (MBeanNode) allMBeans.get(j); ! if (beanNode.getEmsBean().getBeanName().getCanonicalName().indexOf("J2EEApplication="+applicationName) > 0) { found = true; } |
