[jboss-cvs] JBossAS SVN: r100868 - in branches/Branch_Hornet_Temporary_2/hornetq-int/src: resources/META-INF and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Feb 11 09:57:53 EST 2010


Author: ataylor
Date: 2010-02-11 09:57:53 -0500 (Thu, 11 Feb 2010)
New Revision: 100868

Added:
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQComponentConstants.java
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/MBeanComponent.java
Modified:
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQComponent.java
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQDiscoveryComponent.java
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQServerComponent.java
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQServerDiscoveryComponent.java
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/META-INF/rhq-plugin.xml
Log:
code cleanup and core queue component

Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQComponent.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQComponent.java	2010-02-11 14:40:58 UTC (rev 100867)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQComponent.java	2010-02-11 14:57:53 UTC (rev 100868)
@@ -18,6 +18,7 @@
 import org.jboss.as.integration.hornetq.jopr.util.ResultsFormatter;
 import org.rhq.core.domain.configuration.Configuration;
 import org.rhq.core.domain.configuration.PropertyList;
+import org.rhq.core.domain.configuration.PropertyMap;
 import org.rhq.core.domain.configuration.PropertySimple;
 import org.rhq.core.domain.configuration.definition.*;
 import org.rhq.core.domain.measurement.*;
@@ -31,16 +32,19 @@
 import org.rhq.core.pluginapi.operation.OperationResult;
 
 import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
+import static org.jboss.as.integration.hornetq.jopr.HornetQComponentConstants.*;
+
 /**
  * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
  *         Created Feb 2, 2010
  */
-public class HornetQComponent implements ResourceComponent, MeasurementFacet, OperationFacet
+public class HornetQComponent implements ResourceComponent, MeasurementFacet, OperationFacet, MBeanComponent
 {
    private MBeanInvoker util;
 
@@ -75,32 +79,52 @@
 
    public void start(final ResourceContext resourceContext) throws InvalidPluginConfigurationException, Exception
    {
-      HornetQServerComponent hornetQServerComponent = (HornetQServerComponent) resourceContext.getParentResourceComponent();
-      mBeanServer = hornetQServerComponent.getMBeanServer();
-      PropertySimple objectNameProperty = resourceContext.getPluginConfiguration().getSimpleProperties().get("objectName");
-      if(objectNameProperty == null)
+      try
       {
-         throw new InvalidPluginConfigurationException("objectName should be configured on service " + resourceContext.getResourceKey());
+         MBeanComponent hornetQServerComponent = (MBeanComponent) resourceContext.getParentResourceComponent();
+         mBeanServer = hornetQServerComponent.getMBeanServer();
+
+         PropertySimple objectNameProperty = resourceContext.getPluginConfiguration().getSimpleProperties().get(OBJECT_NAME);
+         PropertySimple useParentObjectName = resourceContext.getPluginConfiguration().getSimpleProperties().get(USE_PARENT_OBJECT_NAME);
+         PropertySimple resourceNameProperty = resourceContext.getPluginConfiguration().getSimpleProperties().get(RESOURCE_NAME_PROPERTY);
+         PropertySimple searchStringProperty = resourceContext.getPluginConfiguration().getSimpleProperties().get(SEARCH_STRING);
+         
+         if(objectNameProperty == null && useParentObjectName == null)
+         {
+            throw new InvalidPluginConfigurationException("objectName or useParentObjectName should be configured on service plugin " + resourceContext.getResourceKey());
+         }
+
+         String mBeanName;
+         if(useParentObjectName != null && useParentObjectName.getBooleanValue())
+         {
+            HornetQComponent hornetQComponent = (HornetQComponent) resourceContext.getParentResourceComponent();
+            mBeanName =  hornetQComponent.getObjectName().getCanonicalName(); 
+         }
+         else
+         {
+            mBeanName = objectNameProperty.getStringValue();
+         }
+         if(searchStringProperty != null)
+         {
+            objectName = new ObjectName(mBeanName + "," + resourceNameProperty.getStringValue() + "=" + resourceContext.getResourceKey().split(":")[1]);
+         }
+         else
+         {
+            objectName = new ObjectName(mBeanName);
+         }
+         util = new MBeanInvoker(mBeanServer);
+         this.resourceContext = resourceContext;
+         resultsFormatter = new ResultsFormatter();
       }
-      String mBeanName = objectNameProperty.getStringValue();
-      PropertySimple useResourceKeyForNameProperty = resourceContext.getPluginConfiguration().getSimpleProperties().get("useResourceKeyForName");
-      Boolean useResourceKeyForName = useResourceKeyForNameProperty == null? false:useResourceKeyForNameProperty.getBooleanValue();
-      if(useResourceKeyForName)
+      catch (Throwable e)
       {
-         objectName = new ObjectName(mBeanName + ",name=" + resourceContext.getResourceKey().split(":")[1]);
+         e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
       }
-      else
-      {
-         objectName = new ObjectName(mBeanName);
-      }
-      util = new MBeanInvoker(mBeanServer);
-      this.resourceContext = resourceContext;
-      resultsFormatter = new ResultsFormatter();
    }
 
    public void stop()
    {
-
+      mBeanServer = null;
    }
 
    public AvailabilityType getAvailability()
@@ -108,9 +132,19 @@
       return AvailabilityType.UP;
    }
 
+   public MBeanServer getMBeanServer()
+   {
+      return mBeanServer;
+   }
 
-   private static OperationDefinition getOperationDefinition(final String operationName, final ResourceContext resourceContext)
+
+   public ObjectName getObjectName()
    {
+      return objectName;
+   }
+
+   /*private static OperationDefinition getOperationDefinition(final String operationName, final ResourceContext resourceContext)
+   {
       ResourceType resourceType = resourceContext.getResourceType();
       OperationDefinition operationDefinition = getOperationDefinition(resourceType, operationName);
       if (operationDefinition == null)
@@ -141,5 +175,5 @@
             return operationDefinition;
       }
       return null;
-   }
+   }*/
 }

Added: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQComponentConstants.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQComponentConstants.java	                        (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQComponentConstants.java	2010-02-11 14:57:53 UTC (rev 100868)
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package org.jboss.as.integration.hornetq.jopr;
+
+/**
+ * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
+ *         Created Feb 11, 2010
+ */
+public class HornetQComponentConstants
+{
+
+   public static final String OBJECT_NAME = "objectName";
+
+   public static final String USE_PARENT_OBJECT_NAME = "useParentObjectName";
+
+   public static final String RESOURCE_NAME_PROPERTY = "resourceNameProperty";
+
+   public static final String SEARCH_STRING = "searchString";
+}

Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQDiscoveryComponent.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQDiscoveryComponent.java	2010-02-11 14:40:58 UTC (rev 100867)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQDiscoveryComponent.java	2010-02-11 14:57:53 UTC (rev 100868)
@@ -12,49 +12,66 @@
  */
 package org.jboss.as.integration.hornetq.jopr;
 
+import org.rhq.core.domain.configuration.PropertyList;
+import org.rhq.core.domain.configuration.PropertyMap;
 import org.rhq.core.domain.configuration.PropertySimple;
 import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
 import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
 import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
 import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
 
-import javax.management.MBeanInfo;
-import javax.management.MBeanServer;
-import javax.management.ObjectInstance;
-import javax.management.ObjectName;
+import javax.management.*;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
+import static org.jboss.as.integration.hornetq.jopr.HornetQComponentConstants.*;
+
 /**
  * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
  *         Created Jan 27, 2010
  */
 public class HornetQDiscoveryComponent implements ResourceDiscoveryComponent
 {
+
    public Set<DiscoveredResourceDetails> discoverResources(final ResourceDiscoveryContext ctx) throws InvalidPluginConfigurationException, Exception
    {
+      Set<DiscoveredResourceDetails> set = new HashSet<DiscoveredResourceDetails>();
 
-      Set<DiscoveredResourceDetails> set = new HashSet<DiscoveredResourceDetails>();
-      PropertySimple objectNameProperty = ctx.getDefaultPluginConfiguration().getSimpleProperties().get("objectName");
-      if (objectNameProperty == null)
+      PropertySimple objectNameProperty = ctx.getDefaultPluginConfiguration().getSimpleProperties().get(OBJECT_NAME);
+      PropertySimple useParentObjectName = ctx.getDefaultPluginConfiguration().getSimpleProperties().get(USE_PARENT_OBJECT_NAME);
+      PropertySimple resourceNameProperty = ctx.getDefaultPluginConfiguration().getSimpleProperties().get(RESOURCE_NAME_PROPERTY);
+      PropertySimple searchStringProperty = ctx.getDefaultPluginConfiguration().getSimpleProperties().get(SEARCH_STRING);
+
+      if (objectNameProperty == null && useParentObjectName == null)
       {
-         throw new InvalidPluginConfigurationException("objectName should be configured on service " + ctx.getResourceType());
+         throw new InvalidPluginConfigurationException("objectName or useParentObjectName should be configured on service plugin " + ctx.getResourceType());
       }
-      String mBeanName = objectNameProperty.getStringValue();
-      PropertySimple useResourceKeyForNameProperty = ctx.getDefaultPluginConfiguration().getSimpleProperties().get("useResourceKeyForName");
-      Boolean useResourceKeyForName = useResourceKeyForNameProperty == null ? false : useResourceKeyForNameProperty.getBooleanValue();
-      if (useResourceKeyForName)
+
+      if (searchStringProperty != null)
       {
-         ObjectName name = new ObjectName(mBeanName + ",name=*");
+         ObjectName name;
+         if(useParentObjectName != null && useParentObjectName.getBooleanValue())
+         {
+            HornetQComponent hornetQComponent = (HornetQComponent) ctx.getParentResourceComponent();
+            name = new ObjectName(hornetQComponent.getObjectName() + "," + searchStringProperty.getStringValue());
+         }
+         else
+         {
+            String mBeanName = objectNameProperty.getStringValue();
+            name = new ObjectName(mBeanName + "," + searchStringProperty.getStringValue());
+         }
+
          MBeanServer beanServer = org.jboss.mx.util.MBeanServerLocator.locate();
          Set<ObjectInstance> objectInstances = beanServer.queryMBeans(name, null);
          for (ObjectInstance instance : objectInstances)
          {
-            instance.getObjectName().getCanonicalName();
-            String resourceName = instance.getObjectName().getKeyProperty("name");
+            String resourceName = instance.getObjectName().getKeyProperty(resourceNameProperty.getStringValue());
+            String resourceKey = ctx.getResourceType().getName() + ":" + resourceName;
+            System.out.println("resourceKey = " + resourceKey);
             DiscoveredResourceDetails detail = new DiscoveredResourceDetails(
                   ctx.getResourceType(), // Resource type
-                  ctx.getResourceType().getName() + ":" + resourceName, // Resource key
+                  resourceKey, // Resource key
                   resourceName, // Resource name
                   null, // Resource version
                   ctx.getResourceType().getDescription(), // Description

Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQServerComponent.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQServerComponent.java	2010-02-11 14:40:58 UTC (rev 100867)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQServerComponent.java	2010-02-11 14:57:53 UTC (rev 100868)
@@ -28,10 +28,8 @@
  * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
  *         Created Jan 26, 2010
  */
-public class HornetQServerComponent implements ResourceComponent, MeasurementFacet, OperationFacet
+public class HornetQServerComponent implements ResourceComponent, MeasurementFacet,  MBeanComponent
 {
-   private String[] queueNames;
-
    private ResourceContext resourceContext;
 
    private MBeanServer mBeanServer;
@@ -58,24 +56,14 @@
 
    public void stop()
    {
-      //To change body of implemented methods use File | Settings | File Templates.
+      resourceContext = null;
    }
 
    public AvailabilityType getAvailability()
    {
      return AvailabilityType.UP;
    }
-   
-   public OperationResult invokeOperation(final String s, final Configuration configuration) throws InterruptedException, Exception
-   {
-      return null;  //To change body of implemented methods use File | Settings | File Templates.
-   }
 
-   public void setQueueNames(final String[] queueNames)
-   {
-      this.queueNames = queueNames;
-   }
-
    public MBeanServer getMBeanServer()
    {
       return mBeanServer;

Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQServerDiscoveryComponent.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQServerDiscoveryComponent.java	2010-02-11 14:40:58 UTC (rev 100867)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQServerDiscoveryComponent.java	2010-02-11 14:57:53 UTC (rev 100868)
@@ -39,8 +39,6 @@
    {
       ObjectName name = new ObjectName("org.hornetq:module=JMS,type=Server");
       MBeanServer beanServer = org.jboss.mx.util.MBeanServerLocator.locate();
-
-      MBeanInfo info = beanServer.getMBeanInfo(name);
       String version = (String) beanServer.getAttribute(name, "Version");
       Set<DiscoveredResourceDetails> set = new HashSet<DiscoveredResourceDetails>();
       Configuration c = new Configuration();

Added: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/MBeanComponent.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/MBeanComponent.java	                        (rev 0)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/MBeanComponent.java	2010-02-11 14:57:53 UTC (rev 100868)
@@ -0,0 +1,12 @@
+package org.jboss.as.integration.hornetq.jopr;
+
+import javax.management.MBeanServer;
+
+/**
+ * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
+ *         Created Feb 11, 2010
+ */
+public interface MBeanComponent
+{
+   MBeanServer getMBeanServer();
+}

Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/META-INF/rhq-plugin.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/META-INF/rhq-plugin.xml	2010-02-11 14:40:58 UTC (rev 100867)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/META-INF/rhq-plugin.xml	2010-02-11 14:57:53 UTC (rev 100868)
@@ -68,8 +68,6 @@
          <subcategories>
             <subcategory name="JMS"
                          description="JMS Management">
-               <subcategory name="Queues" description="JMS Queues"/>
-               <subcategory name="Topics" description="JMS Topics"/>
             </subcategory>
             <subcategory name="Core"
                 description="Core Management">
@@ -197,7 +195,8 @@
                   class="HornetQComponent">
             <plugin-configuration>
                 <c:simple-property name="objectName" default="org.hornetq:module=JMS,type=Queue"/>
-                <c:simple-property name="useResourceKeyForName" type="boolean" default="true"/>
+                <c:simple-property name="resourceNameProperty" default="name"/>
+                <c:simple-property name="searchString" default="name=*"/>
             </plugin-configuration>
             &destinationOperations;
             <operation name="listMessages,result=JMSMessage" displayName="list all the messages" description="list all the messages.">
@@ -362,7 +361,8 @@
                   class="HornetQComponent">
             <plugin-configuration>
                 <c:simple-property name="objectName" default="org.hornetq:module=JMS,type=Topic"/>
-                <c:simple-property name="useResourceKeyForName" type="boolean" default="true"/>
+                <c:simple-property name="resourceNameProperty" default="name"/>
+                <c:simple-property name="searchString" default="name=*"/>
             </plugin-configuration>
             &destinationOperations;
             <operation name="listAllSubscriptions,result=SubscriptionInfo" displayName="list all subscriptions" description="Lists all the subscriptions for this topic (both durable and non-durable).">
@@ -788,7 +788,8 @@
                   class="HornetQComponent">
             <plugin-configuration>
                 <c:simple-property name="objectName" default="org.hornetq:module=Core,type=Acceptor"/>
-                <c:simple-property name="useResourceKeyForName" type="boolean" default="true"/>
+                <c:simple-property name="resourceNameProperty" default="name"/>
+                <c:simple-property name="searchString" default="name=*"/>
             </plugin-configuration>
             &hornetqcomponentOperations;
             &hornetqcomponentMetrics;
@@ -811,7 +812,8 @@
                   class="HornetQComponent">
             <plugin-configuration>
                 <c:simple-property name="objectName" default="org.hornetq:module=Core,type=Address"/>
-                <c:simple-property name="useResourceKeyForName" type="boolean" default="true"/>
+                <c:simple-property name="resourceNameProperty" default="name"/>
+                <c:simple-property name="searchString" default="name=*"/>
             </plugin-configuration>
             <operation name="addRole" displayName="Add Role" description="Add a Role to this address.">
               <parameters>
@@ -857,7 +859,8 @@
                   class="HornetQComponent">
             <plugin-configuration>
                 <c:simple-property name="objectName" default="org.hornetq:module=Core,type=Bridge"/>
-                <c:simple-property name="useResourceKeyForName" type="boolean" default="true"/>
+                <c:simple-property name="resourceNameProperty" default="name"/>
+                <c:simple-property name="searchString" default="name=*"/>
             </plugin-configuration>
             &hornetqcomponentMetrics;
             <metric property="Name"
@@ -919,7 +922,8 @@
                   class="HornetQComponent">
             <plugin-configuration>
                 <c:simple-property name="objectName" default="org.hornetq:module=Core,type=BroadcastGroup"/>
-                <c:simple-property name="useResourceKeyForName" type="boolean" default="true"/>
+                <c:simple-property name="resourceNameProperty" default="name"/>
+                <c:simple-property name="searchString" default="name=*"/>
             </plugin-configuration>
             &hornetqcomponentMetrics;
             <metric property="Name"
@@ -953,7 +957,8 @@
                   class="HornetQComponent">
             <plugin-configuration>
                 <c:simple-property name="objectName" default="org.hornetq:module=Core,type=ClusterConnection"/>
-                <c:simple-property name="useResourceKeyForName" type="boolean" default="true"/>
+                <c:simple-property name="resourceNameProperty" default="name"/>
+                <c:simple-property name="searchString" default="name=*"/>
             </plugin-configuration>
             &hornetqcomponentMetrics;
             <metric property="Name"
@@ -1003,7 +1008,8 @@
                   class="HornetQComponent">
             <plugin-configuration>
                 <c:simple-property name="objectName" default="org.hornetq:module=Core,type=DiscoveryGroup"/>
-                <c:simple-property name="useResourceKeyForName" type="boolean" default="true"/>
+                <c:simple-property name="resourceNameProperty" default="name"/>
+                <c:simple-property name="searchString" default="name=*"/>
             </plugin-configuration>
             &hornetqcomponentMetrics;
             <metric property="Name"
@@ -1029,7 +1035,8 @@
                   class="HornetQComponent">
             <plugin-configuration>
                 <c:simple-property name="objectName" default="org.hornetq:module=Core,type=Divert"/>
-                <c:simple-property name="useResourceKeyForName" type="boolean" default="true"/>
+                <c:simple-property name="resourceNameProperty" default="name"/>
+                <c:simple-property name="searchString" default="name=*"/>
             </plugin-configuration>
             <metric property="Filter"
                  displayName="Filter"
@@ -1060,67 +1067,78 @@
                  description="the name of the org.hornetq.core.server.cluster.Transformer implementation associated to this divert"
                  dataType="trait" displayType="summary"/>
          </service>
-         <service name="Core Queues"
-                  discovery="HornetQDiscoveryComponent"
+         <service name="Queues(by address)"
+                  discovery="HornetQDiscoveryComponent"     
                   subCategory="Core"
                   class="HornetQComponent">
             <plugin-configuration>
                 <c:simple-property name="objectName" default="org.hornetq:module=Core,type=Queue"/>
-                <c:simple-property name="useResourceKeyForName" type="boolean" default="true"/>
+                <c:simple-property name="resourceNameProperty" default="address"/>
+                <c:simple-property name="searchString" default="address=*,name=*"/>
             </plugin-configuration>
-            <metric property="Name"
+            <service name="Core Queues"
+                  discovery="HornetQDiscoveryComponent"
+                  class="HornetQComponent">
+                     <plugin-configuration>
+                        <c:simple-property name="useParentObjectName" type="boolean" default="true"/>
+                        <c:simple-property name="resourceNameProperty" default="name"/>
+                        <c:simple-property name="searchString" default="name=*"/>
+                     </plugin-configuration>
+               <metric property="Name"
                  displayName="Name"
                  description="name of this queue"
                  dataType="trait" displayType="summary"/>
-            <metric property="Address"
-                 displayName="Address"
-                 description="the address this queue is bound to"
-                 dataType="trait" displayType="summary"/>
-            <metric property="ID"
-                 displayName="ID"
-                 description="this queue ID"
-                 dataType="trait" displayType="summary"/>
-            <metric property="Temporary"
-                 displayName="Temporary"
-                 description="whether this queue is temporary"
-                 dataType="trait" displayType="summary"/>
-            <metric property="Durable"
-                 displayName="Durable"
-                 description="whether this queue is durable"
-                 dataType="trait" displayType="summary"/>
-            <metric property="Filter"
-                 displayName="Filter"
-                 description="the filter used by this queue"
-                 dataType="trait" displayType="summary"/>
-            <metric property="MessageCount"
-                 displayName="Message Count"
-                 description="the number of messages currently in this queue"
-                 dataType="trait" displayType="summary"/>
-            <metric property="ScheduledCount"
-                 displayName="Scheduled Count"
-                 description="the number of scheduled messages in this queue"
-                 dataType="trait" displayType="summary"/>
-            <metric property="ConsumerCount"
-                 displayName="Consumer Count"
-                 description="the number of consumers consuming messages from this queue"
-                 dataType="trait" displayType="summary"/>
-            <metric property="DeliveringCount"
-                 displayName="Delivering Count"
-                 description="the number of messages that this queue is currently delivering to its consumers"
-                 dataType="trait" displayType="summary"/>
-            <metric property="MessagesAdded"
-                 displayName="Messages Added"
-                 description="the number of messages added to this queue since it was created"
-                 dataType="trait" displayType="summary"/>
-            <metric property="ExpiryAddress"
-                 displayName="Expiry Address"
-                 description="the expiry address associated to this queue"
-                 dataType="trait" displayType="summary"/>
-            <metric property="DeadLetterAddress"
-                 displayName="Dead Letter Address"
-                 description="the dead-letter address associated to this queue"
-                 dataType="trait" displayType="summary"/>
+               <metric property="Address"
+                    displayName="Address"
+                    description="the address this queue is bound to"
+                    dataType="trait" displayType="summary"/>
+               <metric property="ID"
+                    displayName="ID"
+                    description="this queue ID"
+                    dataType="trait" displayType="summary"/>
+               <metric property="Temporary"
+                    displayName="Temporary"
+                    description="whether this queue is temporary"
+                    dataType="trait" displayType="summary"/>
+               <metric property="Durable"
+                    displayName="Durable"
+                    description="whether this queue is durable"
+                    dataType="trait" displayType="summary"/>
+               <metric property="Filter"
+                    displayName="Filter"
+                    description="the filter used by this queue"
+                    dataType="trait" displayType="summary"/>
+               <metric property="MessageCount"
+                    displayName="Message Count"
+                    description="the number of messages currently in this queue"
+                    dataType="trait" displayType="summary"/>
+               <metric property="ScheduledCount"
+                    displayName="Scheduled Count"
+                    description="the number of scheduled messages in this queue"
+                    dataType="trait" displayType="summary"/>
+               <metric property="ConsumerCount"
+                    displayName="Consumer Count"
+                    description="the number of consumers consuming messages from this queue"
+                    dataType="trait" displayType="summary"/>
+               <metric property="DeliveringCount"
+                    displayName="Delivering Count"
+                    description="the number of messages that this queue is currently delivering to its consumers"
+                    dataType="trait" displayType="summary"/>
+               <metric property="MessagesAdded"
+                    displayName="Messages Added"
+                    description="the number of messages added to this queue since it was created"
+                    dataType="trait" displayType="summary"/>
+               <metric property="ExpiryAddress"
+                    displayName="Expiry Address"
+                    description="the expiry address associated to this queue"
+                    dataType="trait" displayType="summary"/>
+               <metric property="DeadLetterAddress"
+                    displayName="Dead Letter Address"
+                    description="the dead-letter address associated to this queue"
+                    dataType="trait" displayType="summary"/>
+               </service>
          </service>
+         
       </server>
-
+     <!-- -->
 </plugin>




More information about the jboss-cvs-commits mailing list