[jboss-cvs] JBossAS SVN: r101071 - in branches/Branch_Hornet_Temporary_2/hornetq-int/src: main/java/org/jboss/as/integration/hornetq/jopr/util and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 17 08:28:37 EST 2010
Author: ataylor
Date: 2010-02-17 08:28:37 -0500 (Wed, 17 Feb 2010)
New Revision: 101071
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/util/JMXInvoker.java
branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/META-INF/rhq-plugin.xml
Log:
fix for syntax
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-17 13:11:02 UTC (rev 101070)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/HornetQComponent.java 2010-02-17 13:28:37 UTC (rev 101071)
@@ -53,6 +53,11 @@
Object attr = invoker.getAttribute(objectName, operation.getOperationName());
report.addData(resultsFormatter.formatMetricResults(attr, operation, resourceContext, request));
}
+ else if(DataType.MEASUREMENT.equals(request.getDataType()))
+ {
+ Object attr = invoker.getAttribute(objectName, operation.getOperationName());
+ report.addData(resultsFormatter.formatMetricResults(attr, operation, resourceContext, request));
+ }
}
}
Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/util/JMXInvoker.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/util/JMXInvoker.java 2010-02-17 13:11:02 UTC (rev 101070)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/util/JMXInvoker.java 2010-02-17 13:28:37 UTC (rev 101071)
@@ -93,6 +93,26 @@
params[pos] = prop.getStringValue();
signature[pos] = java.lang.String.class;
}
+ else if(val[0].equals("Long"))
+ {
+ params[pos] = prop.getLongValue();
+ signature[pos] = java.lang.Long.class;
+ }
+ else if(val[0].equals("long"))
+ {
+ params[pos] = prop.getLongValue();
+ signature[pos] = long.class;
+ }
+ else if(val[0].equals("Integer"))
+ {
+ params[pos] = prop.getIntegerValue();
+ signature[pos] = java.lang.Integer.class;
+ }
+ else if(val[0].equals("int"))
+ {
+ params[pos] = prop.getIntegerValue();
+ signature[pos] = int.class;
+ }
}
pos++;
}
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-17 13:11:02 UTC (rev 101070)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/resources/META-INF/rhq-plugin.xml 2010-02-17 13:28:37 UTC (rev 101071)
@@ -42,7 +42,9 @@
<metric property="Started"
displayName="Started"
description="is this component started"
- dataType="trait" displayType="summary"/>
+ defaultInterval="10000"
+ category="availability"
+ displayType="summary" defaultOn="true"/>
'>
<!ENTITY hornetqcomponentOperations '
<operation name="start" displayName="start" description="Starts this HornetQ component.">
@@ -197,7 +199,7 @@
dataType="trait" displayType="summary"/>
<metric property="ConnectionFactoryNames"
displayName="Connection Factories"
- description="The available connection factories"
+ description="The available connection factories" category="availability"
dataType="trait" displayType="summary"/>
</service>
@@ -484,43 +486,43 @@
<plugin-configuration>
<c:simple-property name="objectName" default="org.hornetq:module=Core,type=Server"/>
</plugin-configuration>
- <operation name="createQueue" displayName="Create a JMS Queue" description="Create a Queue.">
+ <operation name="createQueue" displayName="Create a Queue" description="Creates a new Queue.">
<parameters>
<c:simple-property required="true" name="address" displayName="address"/>
<c:simple-property required="true" name="name" displayName="name"/>
</parameters>
</operation>
- <operation name="createQueue2,operation=createQueue" displayName="Create a JMS Queue" description="Create a Queue with a filter.">
+ <operation name="createQueue2,operation=createQueue" displayName="Create a Queue with filter" description="Creates a new Queue with a given filter.">
<parameters>
<c:simple-property required="true" name="address" displayName="address"/>
<c:simple-property required="true" name="name" displayName="name"/>
<c:simple-property required="true" name="filter" displayName="filter"/>
- <c:simple-property required="true" name="durable" displayName="durable"/>
+ <c:simple-property required="true" type="boolean" name="boolean:durable" displayName="durable"/>
</parameters>
</operation>
- <operation name="createQueue3,operation=createQueue" displayName="Create a JMS Queue" description="Create a Queue.">
+ <operation name="createQueue3,operation=createQueue" displayName="Create a durable Queue" description="Creates a new Queue passing in its durability.">
<parameters>
<c:simple-property required="true" name="address" displayName="address"/>
<c:simple-property required="true" name="name" displayName="name"/>
- <c:simple-property required="true" name="durable" displayName="durable"/>
+ <c:simple-property required="true" type="boolean" name="boolean:durable" displayName="durable"/>
</parameters>
</operation>
- <operation name="deployQueue" displayName="Create a JMS Queue" description="Deploys a Queue with a filter.">
+ <operation name="deployQueue2,operation=deployQueue" displayName="Deploys a Queue with filter" description="Deploys a Queue.">
<parameters>
<c:simple-property required="true" name="address" displayName="address"/>
<c:simple-property required="true" name="name" displayName="name"/>
- <c:simple-property required="true" name="filter" displayName="filter"/>
- <c:simple-property required="true" name="durable" displayName="durable"/>
+ <c:simple-property required="false" name="filter" displayName="filter"/>
</parameters>
</operation>
- <operation name="deployQueue2,operation=deployQueue" displayName="Deploys a JMS Queue" description="Deploys a Queue.">
+ <operation name="deployQueue" displayName="Deploy a Queue with filter and durability" description="Deploys a Queue with a filter and durability.">
<parameters>
<c:simple-property required="true" name="address" displayName="address"/>
<c:simple-property required="true" name="name" displayName="name"/>
- <c:simple-property required="true" name="durable" displayName="durable"/>
+ <c:simple-property required="false" name="filter" displayName="filter"/>
+ <c:simple-property required="true" type="boolean" name="boolean:durable" displayName="durable"/>
</parameters>
</operation>
- <operation name="destroyQueue" displayName="Destroys a JMS Queue" description="Destroys a Queue.">
+ <operation name="destroyQueue" displayName="Destroys a Queue" description="Destroys a Queue.">
<parameters>
<c:simple-property required="true" name="name" displayName="name"/>
</parameters>
@@ -564,11 +566,17 @@
<parameters>
<c:simple-property required="true" name="transactionAsBase64" displayName="transaction As Base64"/>
</parameters>
+ <results>
+ <c:simple-property name="operationResult" type="boolean" displayName="Whether the tx was commited"/>
+ </results>
</operation>
<operation name="rollbackPreparedTransaction" displayName="Rollback a prepared transaction" description="Rollback a prepared transaction.">
<parameters>
<c:simple-property required="true" name="transactionAsBase64" displayName="transaction As Base64"/>
- </parameters>
+ </parameters>
+ <results>
+ <c:simple-property name="operationResult" type="boolean" displayName="Whether the tx was commited"/>
+ </results>
</operation>
<operation name="listRemoteAddresses,result=string[]" displayName="Lists the addresses" description="Lists the addresses of all the clients connected to this address.">
<results>
@@ -623,7 +631,8 @@
<metric property="Started"
displayName="HornetQ Started"
description="Is the JMSServer Started"
- dataType="trait" displayType="summary"/>
+ dataType="trait" displayType="summary"
+ category="availability"/>
<metric property="Version"
displayName="HornetQ Version"
description="The Version of the HornetQ JMS Server"
@@ -635,7 +644,7 @@
<metric property="ConnectionCount"
displayName="Connection Count"
description="number of connections connected to this server"
- dataType="trait" displayType="summary"/>
+ dataType="measurement" displayType="summary"/>
<metric property="InterceptorClassNames"
displayName="Interceptor Class Names"
description="the list of interceptors used by this server"
@@ -723,7 +732,7 @@
<metric property="MessageCounterEnabled"
displayName="Message Counter Enabled"
description="whether message counter is enabled for this server"
- dataType="trait" displayType="summary"/>
+ dataType="trait" displayType="summary" category="availability"/>
<metric property="MessageCounterMaxDayCount"
displayName="Message Counter Max Day Count"
description="the maximum number of days kept in memory for message counter"
@@ -874,7 +883,7 @@
<metric property="NumberOfPages"
displayName="Number Of Pages"
description="Returns the number of pages used by this address"
- dataType="trait" displayType="summary"/>
+ dataType="measurement" displayType="summary"/>
<metric property="NumberOfBytesPerPage"
displayName="Number Of Bytes Per Page"
description="Returns the number of bytes used by each page for this address"
@@ -1154,7 +1163,7 @@
</operation>
<operation name="removeMessage" displayName="remove message" description="Remove the message corresponding to the given messageID.">
<parameters>
- <c:simple-property required="true" name="messageID" displayName="The message ID"/>
+ <c:simple-property required="true" type="long" name="long:messageID" displayName="The message ID"/>
</parameters>
<results>
<c:simple-property name="operationResult" type="boolean" description="Was the message removed."/>
@@ -1178,7 +1187,7 @@
</operation>
<operation name="expireMessage" displayName="expire message" description="Expire the message corresponding to the given messageID.">
<parameters>
- <c:simple-property required="true" name="messageID" displayName="The message ID"/>
+ <c:simple-property required="true" type="long" name="long:messageID" displayName="The message ID"/>
</parameters>
<results>
<c:simple-property name="operationResult" type="boolean" description="Was the message removed."/>
@@ -1186,7 +1195,7 @@
</operation>
<operation name="moveMessage" displayName="move message" description="move the message corresponding to the given messageID.">
<parameters>
- <c:simple-property required="true" name="messageID" displayName="The message ID"/>
+ <c:simple-property required="true" type="long" name="long:messageID" displayName="The message ID"/>
<c:simple-property required="true" name="otherQueueName" displayName="The name of the queue to move the message to"/>
</parameters>
<results>
@@ -1204,13 +1213,13 @@
</operation>
<operation name="sendMessageToDeadLetterAddress" displayName="Send the message corresponding to the given messageID to this queue's Dead Letter Address" description="Send the message corresponding to the given messageID to this queue's Dead Letter Address.">
<parameters>
- <c:simple-property required="true" name="messageID" displayName="The message ID"/>
+ <c:simple-property required="true" type="long" name="long:messageID" displayName="The message ID"/>
</parameters>
<results>
<c:simple-property name="operationResult" type="boolean" description="Was the message removed."/>
</results>
</operation>
- <operation name="sendMessagesToDeadLetterAddress" displayName="Send messages corresponding to Dead Letter Address" description="Send the messages corresponding to the given filter to this queue's Dead Letter Address.">
+ <operation name="sendMessagesToDeadLetterAddress" displayName="Send messages that match a filter to Dead Letter Address" description="Send the messages corresponding to the given filter to this queue's Dead Letter Address.">
<parameters>
<c:simple-property required="false" name="filter" displayName="the filter"/>
</parameters>
@@ -1220,8 +1229,8 @@
</operation>
<operation name="changeMessagePriority" displayName="Change the priority of message" description="Change the priority of the message corresponding to the given messageID.">
<parameters>
- <c:simple-property required="true" name="messageID" displayName="The message ID"/>
- <c:simple-property required="true" name="newPriority" displayName="the new priority (between 0 and 9)"/>
+ <c:simple-property required="true" type="long" name="long:messageID" displayName="The message ID"/>
+ <c:simple-property required="true" type="integer" name="int:newPriority" displayName="the new priority (between 0 and 9)"/>
</parameters>
<results>
<c:simple-property name="operationResult" type="boolean" description="Was the message updated."/>
@@ -1230,7 +1239,7 @@
<operation name="changeMessagesPriority" displayName="Change the priority of messages" description="Change the priority of the message corresponding to the given messageID.">
<parameters>
<c:simple-property required="false" name="filter" displayName="the filter"/>
- <c:simple-property required="true" name="newPriority" displayName="the new priority (between 0 and 9)"/>
+ <c:simple-property required="true" type="integer" name="int:newPriority" displayName="the new priority (between 0 and 9)"/>
</parameters>
<results>
<c:simple-property name="operationResult" type="integer" description="Number of the messages updated."/>
@@ -1289,23 +1298,23 @@
<metric property="MessageCount"
displayName="Message Count"
description="the number of messages currently in this queue"
- dataType="trait" displayType="summary"/>
+ dataType="measurement" displayType="summary"/>
<metric property="ScheduledCount"
displayName="Scheduled Count"
description="the number of scheduled messages in this queue"
- dataType="trait" displayType="summary"/>
+ dataType="measurement" displayType="summary"/>
<metric property="ConsumerCount"
displayName="Consumer Count"
description="the number of consumers consuming messages from this queue"
- dataType="trait" displayType="summary"/>
+ dataType="measurement" 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"/>
+ dataType="measurement" 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"/>
+ dataType="measurement" displayType="summary"/>
<metric property="ExpiryAddress"
displayName="Expiry Address"
description="the expiry address associated to this queue"
More information about the jboss-cvs-commits
mailing list