[jboss-svn-commits] JBL Code SVN: r22741 - in labs/jbossesb/workspace/maeste: product/lib/ext/jms/oracleaq and 4 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sat Sep 13 15:23:30 EDT 2008


Author: maeste
Date: 2008-09-13 15:23:30 -0400 (Sat, 13 Sep 2008)
New Revision: 22741

Added:
   labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBDiscoveryComponent.java
   labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/SOADiscoveryComponent.java
Modified:
   labs/jbossesb/workspace/maeste/
   labs/jbossesb/workspace/maeste/product/lib/ext/jms/oracleaq/readme.txt
   labs/jbossesb/workspace/maeste/product/rosetta/src/org/jboss/internal/soa/esb/couriers/InVMCourier.java
   labs/jbossesb/workspace/maeste/product/samples/quickstarts/helloworld_action/oracle-aq/readme.txt
   labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ActionComponent.java
   labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ActionDiscoveryComponent.java
   labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ListenerComponent.java
   labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java
   labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml
Log:
Merged revisions 22689-22740 via svnmerge from 
https://svn.jboss.org/repos/labs/labs/jbossesb/trunk

........
  r22690 | tcunning | 2008-09-11 22:59:40 +0200 (Thu, 11 Sep 2008) | 3 lines
  
  JBESB-2030
  Add version to the plugin.
........
  r22691 | tcunning | 2008-09-11 23:01:48 +0200 (Thu, 11 Sep 2008) | 3 lines
  
  JBESB-2030
  Add version to plugin.
........
  r22715 | mark.little at jboss.com | 2008-09-12 13:26:38 +0200 (Fri, 12 Sep 2008) | 1 line
  
  https://jira.jboss.org/jira/browse/JBESB-1941
........
  r22732 | mark.little at jboss.com | 2008-09-13 17:50:22 +0200 (Sat, 13 Sep 2008) | 1 line
  
  https://jira.jboss.org/jira/browse/JBESB-1952
........
  r22733 | mark.little at jboss.com | 2008-09-13 17:52:27 +0200 (Sat, 13 Sep 2008) | 1 line
  
  https://jira.jboss.org/jira/browse/JBESB-1952
........



Property changes on: labs/jbossesb/workspace/maeste
___________________________________________________________________
Name: svnmerge-integrated
   - /labs/jbossesb/trunk:1-22688
   + /labs/jbossesb/trunk:1-22740

Modified: labs/jbossesb/workspace/maeste/product/lib/ext/jms/oracleaq/readme.txt
===================================================================
--- labs/jbossesb/workspace/maeste/product/lib/ext/jms/oracleaq/readme.txt	2008-09-13 18:50:53 UTC (rev 22740)
+++ labs/jbossesb/workspace/maeste/product/lib/ext/jms/oracleaq/readme.txt	2008-09-13 19:23:30 UTC (rev 22741)
@@ -8,9 +8,10 @@
 From lib/ext obtain
 
 asm.jar
-cglib-2.1_2jboss.jar
 mockejb.jar
 
+From maven obtain cglib-2.1_2jboss.jar (maven)
+
 In plugins/org.jboss.soa.esb.oracle.aq run the package target and obtain
 
 org.jboss.soa.esb.oracle.aq.<version>.jar.
@@ -35,10 +36,7 @@
 2. Oracle AQ does not have a JNDI provider and it is common to register
    Queues in an LDAP. Here we chose to register the Queues to MockContext
    which is why you need the mockejb.jar, as well as the asm and cglib jars
-   that it depends on. The org.jboss.soa.esb.oracle.aq-4.2.MR2.jar plugin
+   that it depends on. The org.jboss.soa.esb.oracle.aq.<version>.jar plugin
    does the actual work of registering. Registering to JNP proved not
    possible because of code in the Oracle API to support option 1, the LDAP
    registration.
-
-
-

Modified: labs/jbossesb/workspace/maeste/product/rosetta/src/org/jboss/internal/soa/esb/couriers/InVMCourier.java
===================================================================
--- labs/jbossesb/workspace/maeste/product/rosetta/src/org/jboss/internal/soa/esb/couriers/InVMCourier.java	2008-09-13 18:50:53 UTC (rev 22740)
+++ labs/jbossesb/workspace/maeste/product/rosetta/src/org/jboss/internal/soa/esb/couriers/InVMCourier.java	2008-09-13 19:23:30 UTC (rev 22741)
@@ -153,21 +153,45 @@
             }
             else
             {
-                synchronized (messageQueue) {
-
-                    if (!addMessageToQueue(message)) {
+                Object addedObject;
+                
+                if (passByValue) {
+                    try {
+                        addedObject = MessageSerializer.serialize(message);
+                    } catch (IOException ex) {
+                        logger.warn("Could not serialize message to pass by value.", ex);
                         return false;
                     }
+                } else {
+                    addedObject = message;
+                }
+                
+                synchronized (messageQueue) {
 
+                    messageQueue.add(addedObject);
+
                     // Notify 1 waiting pickup thread of the delivery...
                     messageQueue.notify();
 
                     if (deliveryTimeout > 0) {
-                        try {
-                            // Wait on notification from the pickup thread...
-                            messageQueue.wait(deliveryTimeout);
-                        } catch (InterruptedException e) {
-                            logger.warn("Timeout expired while waiting on message pickup on InVM queue '" + epr.getAddr().getAddress() + "'.", e);
+                        long start = System.currentTimeMillis();
+
+                        // Continue to wait until the "addedObject" has been removed from the queue,
+                        // or the delivery timeout expires...
+                        while(messageQueue.contains(addedObject)) {
+                            try {
+                                // Wait on notification from the pickup thread....
+                                messageQueue.wait(5); // Yes, it's a "magic" number, but we don't need to configure it or make a one-off constant!!!
+                            } catch (InterruptedException e) {
+                                logger.warn("Waiting delivery thread interupted while waiting on message pickup on InVM queue '" + epr.getAddr().getAddress() + "'.  Exiting pickup wait state.");
+                                break;
+                            }
+
+                            // If the delivery timeout has expired...
+                            if(System.currentTimeMillis() > start + deliveryTimeout) {
+                                logger.warn("Timeout expired while waiting on message pickup on InVM queue '" + epr.getAddr().getAddress() + "'.");
+                                break;
+                            }
                         }
                     }
                 }
@@ -183,19 +207,23 @@
         }
     }
 
-    private boolean addMessageToQueue(Message message) {
+    private Object addMessageToQueue(Message message) {
+        Object addedObject;
+
         if (passByValue) {
             try {
-                messageQueue.add(MessageSerializer.serialize(message));
+                addedObject = MessageSerializer.serialize(message);
+                messageQueue.add(addedObject);
             } catch (IOException ex) {
                 logger.warn("Could not serialize message to pass by value.", ex);
                 return false;
             }
         } else {
+            addedObject = message;
             messageQueue.add(message);
         }
 
-        return true;
+        return addedObject;
     }
 
     /**
@@ -319,7 +347,9 @@
     {
         synchronized (messageQueue)
         {
-            if (!addMessageToQueue(message)) {
+            Object addedObject = addMessageToQueue(message);
+
+            if (addedObject == null) {
                 return false;
             }
 
@@ -345,7 +375,7 @@
     public boolean doRedeliver (Message message)
     {
         synchronized (messageQueue) {
-                messageQueue.add(message);
+            messageQueue.add(message);
         }
         
         return true;

Modified: labs/jbossesb/workspace/maeste/product/samples/quickstarts/helloworld_action/oracle-aq/readme.txt
===================================================================
--- labs/jbossesb/workspace/maeste/product/samples/quickstarts/helloworld_action/oracle-aq/readme.txt	2008-09-13 18:50:53 UTC (rev 22740)
+++ labs/jbossesb/workspace/maeste/product/samples/quickstarts/helloworld_action/oracle-aq/readme.txt	2008-09-13 19:23:30 UTC (rev 22741)
@@ -4,22 +4,22 @@
 	ACTION_REQUEST, B and HELLO_WORLD_ACTION, make sure to set 
 	the payload type to Object: SYS, AQ$_JMS_MESSAGE.
 
-2. Edit the jndi.properties file to reflect your database connection settings
+2. Edit the jboss-esb.xml file to reflect your database connection settings
 
 3. Copy the jndi.properties and the jboss-esb.xml in the helloworld_action directory.
 
-4. From the lib/ext/jms/oracleaq directory copy the following jars in to the
+4. Follow the instructions in the readme.txt within lib/ext/jms/oracleaq and place the following jars in the
 	helloworld_action/lib directory	
 
-  26747 Mar 18 18:16 asm.jar
- 286330 Mar 18 18:16 cglib-2.1_2jboss.jar
- 120342 Aug  4  2006 mockejb.jar
-   8757 Apr  4 14:13 org.jboss.soa.esb.oracle.aq-4.2.MR2.jar
+  asm.jar
+  cglib-2.1_2jboss.jar
+  mockejb.jar
+  org.jboss.soa.esb.oracle.aq.<version>.jar
    
    and obtain the following jars from your Oracle DB install:
    
- 772466 Mar 27 11:14 aqapi13.jar  (from oracle)
-1397543 Mar 27 11:13 ojdbc14.jar  (from oracle)
+  aqapi13.jar  (from oracle)
+  ojdbc14.jar  (from oracle)
    
 
 Note that 
@@ -28,7 +28,16 @@
 2. Oracle AQ does not have a JNDI provider and it is common to register
    Queues in an LDAP. Here we chose to register the Queues to MockContext
    which is why you need the mockejb.jar, as well as the asm and cglib jars
-   that it depends on. The org.jboss.soa.esb.oracle.aq-4.2.MR2.jar plugin
+   that it depends on. The org.jboss.soa.esb.oracle.aq.<version>.MR2.jar plugin
    does the actual work of registering. Registering to JNP proved not
    possible because of code in the Oracle API to support option 1, the LDAP
-   registration.
\ No newline at end of file
+   registration.
+
+
+The following can be used to create the queue table, create the queue, and enable the queue: 
+
+exec dbms_aqadm.CREATE_queue_table(queue_table => 'myqueue_table_name', multiple_consumers => FALSE, queue_payload_type => 'SYS.AQ$_JMS_MESSAGE'); 
+
+exec dbms_aqadm.CREATE_queue(queue_name => 'myqueue_name', queue_table => 'myqueue_table_name'); 
+
+exec dbms_aqadm.start_queue( queue_name =>'myqueue_name' ,enqueue => true ,dequeue => true );
\ No newline at end of file

Modified: labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ActionComponent.java
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ActionComponent.java	2008-09-13 18:50:53 UTC (rev 22740)
+++ labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ActionComponent.java	2008-09-13 19:23:30 UTC (rev 22741)
@@ -33,7 +33,9 @@
 import org.mc4j.ems.connection.bean.EmsBean;
 
 /**
- * @author Greg Hinkle
+ * The ActionComponent finds ESB action data (messages, bytes, time).
+ * 
+ * @author Tom Cunningham
  */
 public class ActionComponent extends MBeanResourceComponent<MBeanResourceComponent> {
     private ResourceContext<MBeanResourceComponent> context;

Modified: labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ActionDiscoveryComponent.java
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ActionDiscoveryComponent.java	2008-09-13 18:50:53 UTC (rev 22740)
+++ labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ActionDiscoveryComponent.java	2008-09-13 19:23:30 UTC (rev 22741)
@@ -20,6 +20,7 @@
 
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -40,12 +41,12 @@
 import org.rhq.plugins.jmx.MBeanResourceComponent;
 
 /**
- * Discovers hibernate entities from a hibernate stats mbean
+ * Discovers ESB actions from a JMX bean
  *
- * @author Greg Hinkle
+ * @author Tom Cunningham
  * @param <T>
  */
-public class ActionDiscoveryComponent<T extends JMXComponent> implements ResourceDiscoveryComponent<MBeanResourceComponent> {
+public class ActionDiscoveryComponent<T extends JMXComponent> extends SOADiscoveryComponent {
 	
 	private static final String SERVICE_NAME = "service-name";
 	private static final String MESSAGES_SUCCESSFULLY_PROCESSED = "messages successfully processed count";
@@ -75,8 +76,16 @@
         Set<DiscoveredResourceDetails> entities = new HashSet<DiscoveredResourceDetails>();
 
         EmsBean actionBean = context.getParentResourceComponent().getEmsBean();
-        String serviceName = actionBean.getBeanName().getKeyProperty(SERVICE_NAME);
-
+        String serviceName = actionBean.getBeanName().getKeyProperty(SERVICE_NAME);        
+        
+        String versionNumber;
+        try {
+        	Hashtable ht = getVersionAttribute(context);
+        	versionNumber = (String) ht.get(VERSION_NUMBER);
+        } catch (Exception e) {
+        	versionNumber = "";
+        }
+        
         // Do two passes - one to grab the entity names (ex. "data fileraction"
         // and then a second to build up the metrics for the entity
         Set<EmsAttribute> attributeSet = actionBean.getAttributes();
@@ -89,11 +98,7 @@
                 
                 Configuration pc = detail.getPluginConfiguration();
                 ArrayList<Property> props = new ArrayList<Property>();
-                //PropertySimple ps = new PropertySimple("", "");
-                //props.add(ps);
-                //pc.setProperties(props);
-                //List<EmsAttribute> refreshedAttribute = actionBean.refreshAttributes();
-                
+                detail.setResourceVersion(versionNumber);
                 entities.add(detail);
         	}
         }

Copied: labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBDiscoveryComponent.java (from rev 22733, labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBDiscoveryComponent.java)
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBDiscoveryComponent.java	                        (rev 0)
+++ labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBDiscoveryComponent.java	2008-09-13 19:23:30 UTC (rev 22741)
@@ -0,0 +1,46 @@
+package org.jbosson.plugins.jbossesb;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.mc4j.ems.connection.bean.EmsBean;
+import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.plugins.jmx.JMXComponent;
+import org.rhq.plugins.jmx.JMXDiscoveryComponent;
+import org.rhq.plugins.jmx.MBeanResourceComponent;
+import org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent;
+
+/**
+ * This DiscoveryComponent extends the MBeanResouceDiscoveryComponent, but also
+ * adds in the version number from the application server. 
+ *
+ * @author Tom Cunningham
+ */
+public class ESBDiscoveryComponent extends MBeanResourceDiscoveryComponent {
+    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);
+		    EmsAttribute versionAttribute = bean.getAttribute(SOADiscoveryComponent.VERSION_NUMBER);		
+		    versionNumber = (String) versionAttribute.refresh();
+        } catch (Exception e) {
+        	versionNumber = "";
+        }
+ 
+        for (DiscoveredResourceDetails jmxResource : jmxResources) {
+        	jmxResource.setResourceVersion(versionNumber);
+        }
+
+        return jmxResources;
+    }
+}
\ No newline at end of file

Modified: labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ListenerComponent.java
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ListenerComponent.java	2008-09-13 18:50:53 UTC (rev 22740)
+++ labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ListenerComponent.java	2008-09-13 19:23:30 UTC (rev 22741)
@@ -35,7 +35,9 @@
 
 
 /**
- * @author Greg Hinkle
+ * The ListenerComponent finds ESB configuration data stored in jboss-esb.xml.
+ * 
+ * @author Tom Cunningham
  */
 public class ListenerComponent extends MBeanResourceComponent<MBeanResourceComponent> {
     private ResourceContext<MBeanResourceComponent> context;

Copied: labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/SOADiscoveryComponent.java (from rev 22733, labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/SOADiscoveryComponent.java)
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/SOADiscoveryComponent.java	                        (rev 0)
+++ labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/SOADiscoveryComponent.java	2008-09-13 19:23:30 UTC (rev 22741)
@@ -0,0 +1,45 @@
+package org.jbosson.plugins.jbossesb;
+
+import java.util.Hashtable;
+
+import org.mc4j.ems.connection.bean.EmsBean;
+import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+import org.rhq.plugins.jmx.MBeanResourceComponent;
+
+/**
+ * Abstract class which gets version attributes.
+ *
+ * @author Tom Cunningham
+ * @param <T>
+ */
+public abstract class SOADiscoveryComponent implements ResourceDiscoveryComponent<MBeanResourceComponent>  {
+	public static final String SYSTEM_BEAN = "jboss.system:type=Server";
+	public static final String VERSION_NUMBER = "VersionNumber";
+	public static final String BUILD_DATE = "BuildDate";
+	public static final String BUILD_ID = "BuildID";
+	
+	public Hashtable getVersionAttribute(ResourceDiscoveryContext<MBeanResourceComponent> context) {
+	    Hashtable ht = new Hashtable();
+
+		try {
+			EmsBean bean = context.getParentResourceComponent().getEmsConnection().getBean(SYSTEM_BEAN);
+		    EmsAttribute versionAttribute = bean.getAttribute(VERSION_NUMBER);		
+		    String version = (String) versionAttribute.refresh();
+		    
+		    EmsAttribute buildDateAttribute = bean.getAttribute(BUILD_DATE);
+		    String buildDate = (String) buildDateAttribute.refresh();
+	
+		    EmsAttribute buildIDAttribute = bean.getAttribute(BUILD_ID);
+		    String buildID = (String) buildIDAttribute.refresh();
+	
+		    ht.put(VERSION_NUMBER, version);
+		    ht.put(BUILD_DATE, buildDate);
+		    ht.put(BUILD_ID, buildID);
+		} catch (Exception e) {
+			// Do nothing in the case that we cannot recover these attributes
+		}
+	    return ht;
+	}
+}

Modified: labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java	2008-09-13 18:50:53 UTC (rev 22740)
+++ labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java	2008-09-13 19:23:30 UTC (rev 22741)
@@ -34,7 +34,9 @@
 
 
 /**
- * @author Greg Hinkle
+ * The ServiceComponent finds ESB service data (messages, bytes, time).
+ * 
+ * @author Tom Cunningham
  */
 public class ServiceComponent extends MBeanResourceComponent<MBeanResourceComponent> {
     private ResourceContext<MBeanResourceComponent> context;

Modified: labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml	2008-09-13 18:50:53 UTC (rev 22740)
+++ labs/jbossesb/workspace/maeste/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml	2008-09-13 19:23:30 UTC (rev 22741)
@@ -14,7 +14,7 @@
    <depends plugin="JBossAS" useClasses="true"/>
 
    <service name="ESB"
-      discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent"
+      discovery="org.jbosson.plugins.jbossesb.ESBDiscoveryComponent"
       class="org.rhq.plugins.jmx.MBeanResourceComponent"
       description="Overall statistics for JBoss ESB"
       singleton="true">
@@ -27,7 +27,11 @@
          <c:simple-property name="nameTemplate" default="JBoss ESB Statistics"/>
          <c:simple-property name="descriptionTemplate" default="JBoss ESB statistics."/>
       </plugin-configuration>
-
+      <operation name="start" displayName="Start deployment" description="Start the JBoss ESB deployment"/>
+      <operation name="stop" displayName="Stop deployment" description="Stop the JBoss ESB deployment"/>
+      <operation name="create" displayName="Move .esb deployment into the create state" description="Move the .esb deployment into the create state"/>
+      <operation name="destroy" displayName="Move .esb deployment into the destroy state" description="Move the .esb deployment into the destroy state"/>
+      <operation name="resetCounts" displayName="Reset Counts" description="Reset the overall counter"/>
       <metric displayName="Successful Message Count" property="SuccessfulMessageCount" category="utilization" displayType="summary" measurementType="dynamic" description="Overall Successful Message Count"/>
       <metric displayName="Total Message Count" property="TotalMessageCount" category="utilization" displayType="summary" defaultOn="true" measurementType="dynamic" description="Total Message Count"/>
       <metric displayName="Failed Message Count" property="FailedMessageCount" category="utilization" displayType="summary" defaultOn="true" measurementType="dynamic" description="Failed Message Count"/>
@@ -37,7 +41,7 @@
       <metric displayName="Bytes Processed" property="ProcessedBytes" units="bytes" category="utilization" displayType="summary" defaultOn="true" measurementType="dynamic" description="Overall Bytes Processed"/>
 
    <service name="JBoss ESB Deployment"
-      discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent"
+      discovery="org.jbosson.plugins.jbossesb.ESBDiscoveryComponent"
       class="org.rhq.plugins.jmx.MBeanResourceComponent"
       description="Statistics for JBoss ESB Deployments">
 
@@ -63,7 +67,7 @@
           ]]>
        </help>
       <service name="JBoss ESB Services"
-         discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent"
+         discovery="org.jbosson.plugins.jbossesb.ESBDiscoveryComponent"
          class="ServiceComponent"
          description="JBoss ESB Services">
          <plugin-configuration>
@@ -72,7 +76,7 @@
               <c:simple-property name="DescriptionTemplate" default="JBoss ESB statistics for the {serviceName} service."/>
               <c:simple-property name="serviceName" type="string" description="the JBoss ESB service name"/>
          </plugin-configuration>
-         <operation name="resetCounts" displayName="Reset the message counter" description="Reset the message counter"/>
+         <operation name="resetCounter" displayName="Reset the message counter" description="Reset the message counter"/>
          <metric displayName="Overall Service Message Count" property="overallMessageCount" category="utilization" displayType="summary" measurementType="dynamic" description="Overall Service Message Count"/>
 	 <metric displayName="Overall Service Bytes Processed" property="overallBytesProcessed" units="bytes" category="utilization" displayType="summary" defaultOn="true" measurementType="dynamic" description="Overall Service Bytes Processed"/>
 	 <metric displayName="Overall Service Bytes Failed" property="overallBytesFailed" units="bytes" category="utilization" displayType="summary" defaultOn="true" measurementType="dynamic" description="Overall Service Bytes Failed"/>
@@ -82,7 +86,7 @@
              ]]>
          </help>
 	 <service name="JBoss ESB Listeners"
-		discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent"
+		discovery="org.jbosson.plugins.jbossesb.ESBDiscoveryComponent"
 		class="ListenerComponent"
 		description="JBoss ESB Listeners">
 	     <plugin-configuration>




More information about the jboss-svn-commits mailing list