[jboss-svn-commits] JBL Code SVN: r30586 - labs/jbossesb/branches/JBESB_4_7_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2009-12-11 00:29:06 -0500 (Fri, 11 Dec 2009)
New Revision: 30586

Modified:
   labs/jbossesb/branches/JBESB_4_7_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBDiscoveryComponent.java
Log:
JBESB-2993
Add the service's description as the description in JON if it has one.


Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBDiscoveryComponent.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBDiscoveryComponent.java	2009-12-10 20:59:16 UTC (rev 30585)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBDiscoveryComponent.java	2009-12-11 05:29:06 UTC (rev 30586)
@@ -1,4 +1,5 @@
 package org.jbosson.plugins.jbossesb;
+import java.util.Iterator;
 import java.util.Set;
 
 import org.mc4j.ems.connection.bean.EmsBean;
@@ -15,21 +16,45 @@
  * @author Tom Cunningham
  */
 public class ESBDiscoveryComponent extends MBeanResourceDiscoveryComponent<JMXComponent> {    
+	private static final String NAME = "name";
+	private static final String RESOURCE_KEY  = "key";
+	private static final String SERVICE_DESCRIPTION = "service description";
+
 	@Override
 	public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext<JMXComponent> context) {
         Set<DiscoveredResourceDetails> jmxResources = super.discoverResources(context);
 
         String versionNumber;
-        try {
-			EmsBean bean = context.getParentResourceComponent().getEmsConnection().getBean(SOADiscoveryComponent.SYSTEM_BEAN);
+        String description = "Service Entity";
+		EmsBean bean = context.getParentResourceComponent().getEmsConnection().getBean(SOADiscoveryComponent.SYSTEM_BEAN);
+		String resourceKey = null;
+		
+		for (Iterator i = jmxResources.iterator(); i.hasNext();) {
+        	DiscoveredResourceDetails drd = (DiscoveredResourceDetails) i.next();
+        	resourceKey = drd.getResourceKey();
+		}
+		
+		EmsBean discoverBean = context.getParentResourceComponent().getEmsConnection().getBean(resourceKey);
+		try {
 		    EmsAttribute versionAttribute = bean.getAttribute(SOADiscoveryComponent.VERSION_NUMBER);		
 		    versionNumber = (String) versionAttribute.refresh();
         } catch (Exception e) {
         	versionNumber = "";
         }
- 
+
+        String name = discoverBean.getBeanName().getKeyProperty(NAME);
+        Set<EmsAttribute> attributeSet = discoverBean.getAttributes();
+        for (Iterator i = attributeSet.iterator(); i.hasNext();) {
+        	EmsAttribute attr = (EmsAttribute) i.next();
+
+        	if (attr.getName().endsWith(SERVICE_DESCRIPTION)) {
+        		description = (String) attr.getValue();
+        	}
+        }
+        
         for (DiscoveredResourceDetails jmxResource : jmxResources) {
         	jmxResource.setResourceVersion(versionNumber);
+        	jmxResource.setResourceDescription(description);
         }
 
         return jmxResources;