JBoss hornetq SVN: r9326 - trunk/src/main/org/hornetq/ra.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-06-15 10:31:42 -0400 (Tue, 15 Jun 2010)
New Revision: 9326
Modified:
trunk/src/main/org/hornetq/ra/HornetQRASession.java
Log:
prevent a NPE in checkState()
Modified: trunk/src/main/org/hornetq/ra/HornetQRASession.java
===================================================================
--- trunk/src/main/org/hornetq/ra/HornetQRASession.java 2010-06-15 12:38:45 UTC (rev 9325)
+++ trunk/src/main/org/hornetq/ra/HornetQRASession.java 2010-06-15 14:31:42 UTC (rev 9326)
@@ -1622,6 +1622,9 @@
*/
public void checkState() throws JMSException
{
- mc.checkTransactionActive();
+ if (mc != null)
+ {
+ mc.checkTransactionActive();
+ }
}
}
13 years, 10 months
JBoss hornetq SVN: r9325 - projects/jopr-plugin/tags.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2010-06-15 08:38:45 -0400 (Tue, 15 Jun 2010)
New Revision: 9325
Added:
projects/jopr-plugin/tags/HornetQ-jopr-plugin_1_0_0_CR1/
Log:
HornetQ jopr plugin 1.0.0.CR1 tag
Copied: projects/jopr-plugin/tags/HornetQ-jopr-plugin_1_0_0_CR1 (from rev 9324, projects/jopr-plugin/trunk)
13 years, 10 months
JBoss hornetq SVN: r9322 - projects/jopr-plugin/tags.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2010-06-15 08:33:31 -0400 (Tue, 15 Jun 2010)
New Revision: 9322
Added:
projects/jopr-plugin/tags/HornetQ-jopr-plugin_1_0_0_CR1/
Log:
HornetQ jopr plugin 1.0.0.CR1 tag
Copied: projects/jopr-plugin/tags/HornetQ-jopr-plugin_1_0_0_CR1 (from rev 9321, projects/jopr-plugin/trunk)
13 years, 10 months
JBoss hornetq SVN: r9320 - in projects/jopr-plugin/trunk/src: resources/META-INF and 1 other directory.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2010-06-15 06:58:55 -0400 (Tue, 15 Jun 2010)
New Revision: 9320
Modified:
projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSManagerComponent.java
projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSManagerDiscoveryComponent.java
projects/jopr-plugin/trunk/src/resources/META-INF/rhq-plugin.xml
Log:
changes to JMS Manager type
Modified: projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSManagerComponent.java
===================================================================
--- projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSManagerComponent.java 2010-06-15 10:32:20 UTC (rev 9319)
+++ projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSManagerComponent.java 2010-06-15 10:58:55 UTC (rev 9320)
@@ -56,18 +56,16 @@
for (MeasurementScheduleRequest measurementScheduleRequest : measurementScheduleRequests)
{
-
- if("version".equalsIgnoreCase(measurementScheduleRequest.getName()))
+ if("provider".equalsIgnoreCase(measurementScheduleRequest.getName()))
{
- ManagementView managementView = getProfileService();
- ManagedOperation operation = ManagementSupport.getOperation(managementView, "JMSServerMO", "getVersion", new ComponentType("JMSManage", "ServerManage"));
- SimpleValueSupport support = (SimpleValueSupport) operation.invoke();measurementReport.addData(new MeasurementDataTrait(measurementScheduleRequest, support.getValue().toString()));
+ measurementReport.addData(new MeasurementDataTrait(measurementScheduleRequest, "HornetQ"));
}
else if("started".equalsIgnoreCase(measurementScheduleRequest.getName()))
{
ManagementView managementView = getProfileService();
ManagedOperation operation = ManagementSupport.getOperation(managementView, "JMSServerMO", "isStarted", new ComponentType("JMSManage", "ServerManage"));
- SimpleValueSupport support = (SimpleValueSupport) operation.invoke();measurementReport.addData(new MeasurementDataTrait(measurementScheduleRequest, support.getValue().toString()));
+ SimpleValueSupport support = (SimpleValueSupport) operation.invoke();
+ measurementReport.addData(new MeasurementDataTrait(measurementScheduleRequest, support.getValue().toString()));
}
}
Modified: projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSManagerDiscoveryComponent.java
===================================================================
--- projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSManagerDiscoveryComponent.java 2010-06-15 10:32:20 UTC (rev 9319)
+++ projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSManagerDiscoveryComponent.java 2010-06-15 10:58:55 UTC (rev 9320)
@@ -21,9 +21,12 @@
*/
package org.jboss.as.integration.hornetq.jopr;
+import org.jboss.as.integration.hornetq.jopr.util.ManagementSupport;
import org.jboss.deployers.spi.management.ManagementView;
import org.jboss.managed.api.ComponentType;
import org.jboss.managed.api.ManagedComponent;
+import org.jboss.managed.api.ManagedOperation;
+import org.jboss.metatype.api.values.SimpleValueSupport;
import org.rhq.core.pluginapi.inventory.*;
import java.lang.reflect.Method;
@@ -46,8 +49,8 @@
ctx.getResourceType(), // Resource type
ctx.getResourceType().getName(), // Resource key
ctx.getResourceType().getName(), // Resource name
- null, // Resource version
- ctx.getResourceType().getDescription(), // Description
+ getVersion(ctx), // HornetQ Resource version
+ "The HornetQ JMS provider", // Description
ctx.getDefaultPluginConfiguration(), // Plugin config
null // Process info from a process scan
);
@@ -64,4 +67,11 @@
m = conn.getClass().getMethod("getManagementView");
return (ManagementView) m.invoke(conn);
}
+ private String getVersion(ResourceDiscoveryContext ctx) throws Exception
+ {
+ ManagementView managementView = getProfileService(ctx);
+ ManagedOperation operation = ManagementSupport.getOperation(managementView, "JMSServerMO", "getVersion", new ComponentType("JMSManage", "ServerManage"));
+ SimpleValueSupport support = (SimpleValueSupport) operation.invoke();
+ return support.getValue().toString();
+ }
}
Modified: projects/jopr-plugin/trunk/src/resources/META-INF/rhq-plugin.xml
===================================================================
--- projects/jopr-plugin/trunk/src/resources/META-INF/rhq-plugin.xml 2010-06-15 10:32:20 UTC (rev 9319)
+++ projects/jopr-plugin/trunk/src/resources/META-INF/rhq-plugin.xml 2010-06-15 10:58:55 UTC (rev 9320)
@@ -93,9 +93,9 @@
<operation name="disableMessageCounters" displayName="Disable Message Counters" description="Disable Message Counters."/>
<operation name="resetAllMessageCounters" displayName="Reset All MessageCounters" description="Reset All MessageCounters."/>
<operation name="resetAllMessageCounterHistories" displayName="Reset All Message Counter Histories" description="Reset All Message Counter Histories."/>
- <metric property="version"
- displayName="HornetQ Version"
- description="The HornetQ version"
+ <metric property="provider"
+ displayName="Provider Name"
+ description="The JMS Provider"
dataType="trait" displayType="summary"/>
<metric property="started"
displayName="Is Started"
@@ -169,22 +169,22 @@
<c:simple-property name="operationResult" type="boolean" description="Was the message removed."/>
</results>
</operation>
- <operation name="sendMessageToDeadLetterAddress" displayName="Send Message to DLA"
+ <operation name="sendMessageToDeadLetterAddress" displayName="Send Message to 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" description="The message ID of the message to send to the DLA"/>
+ <c:simple-property required="true" name="messageID" displayName="The message ID" description="The message ID of the message to send to the dead letter address"/>
</parameters>
<results>
<c:simple-property name="operationResult" type="boolean" description="Was the message sent."/>
</results>
</operation>
- <operation name="sendMessagesToDeadLetterAddress" displayName="Send Messages to DLA"
+ <operation name="sendMessagesToDeadLetterAddress" displayName="Send Messages 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="selector" displayName="A JMS message selector" description="A selector string to match, the default, no selector, means send all messages to DLA."/>
+ <c:simple-property required="false" name="selector" displayName="A JMS message selector" description="A selector string to match, the default, no selector, means send all messages to dead letter address."/>
</parameters>
<results>
- <c:simple-property name="operationResult" type="integer" description="Number of messages sent to the DLA."/>
+ <c:simple-property name="operationResult" type="integer" description="Number of messages sent to the dead letter address."/>
</results>
</operation>
<operation name="changeMessagePriority" displayName="Change Message Priority"
@@ -261,7 +261,7 @@
</operation>
<operation name="pause" displayName="Pause the Queue" description="Pause the Queue. If the queue is paused no messages can be routed to it or consumed from it.">
</operation>
- <operation name="resume" displayName="restart the Queue" description="Restart the Queue from its paused state.">
+ <operation name="resume" displayName="Restart the Queue" description="Restart the Queue from its paused state.">
</operation>
&destinationMetrics;
<metric property="getMessageCount"
@@ -285,7 +285,7 @@
description="number of messages added to this queue since it was initially created"
dataType="measurement" displayType="summary"/>
<metric property="isPaused"
- displayName="paused"
+ displayName="Paused"
description="Is the queue currently paused"
dataType="trait" displayType="summary"/>
<resource-configuration>
@@ -327,8 +327,8 @@
<c:description>How long to wait (in milli seconds) before redistributing messages to another node when clustered when a queue has no consumers. Default -1 means do not re distribute.</c:description>
</c:simple-property>
<c:simple-property name="sendToDLAOnNoRoute" default="false" type="boolean"
- displayName="Send To DLA on no route" required="true">
- <c:description>Whether or not messages routed to this address gets sent to DLA when no consumers are available</c:description>
+ displayName="Send To dead letter address on no route" required="true">
+ <c:description>Whether or not messages routed to this address gets sent to dead letter address when no consumers are available</c:description>
</c:simple-property>
<c:simple-property name="addressFullMessagePolicy" default="PAGE" type="string"
displayName="Address Full Message Policy" required="true">
@@ -494,7 +494,7 @@
<c:description>comma-separated list of JNDI bindings (use '&comma;' if u need to use commas in your jndi name)</c:description>
</c:simple-property>
<c:simple-property name="dla" displayName="Dead Letter Address" required="false">
- <c:description>The address to route messages to once the message has been delivered more than the configured number of times. This is specified by 'Max Delivery Attempts'. The default is no DLA</c:description>
+ <c:description>The address to route messages to once the message has been delivered more than the configured number of times. This is specified by 'Max Delivery Attempts'. The default is no dead letter address</c:description>
</c:simple-property>
<c:simple-property name="expiryAddress" displayName="Expiry Address" required="false">
<c:description>The Address to route messages to once they have expired. The default is no expiry address</c:description>
@@ -524,8 +524,8 @@
<c:description>How long to wait (in milli seconds) before redistributing messages to another node when clustered when a queue has no consumers. Default -1 means do not re distribute.</c:description>
</c:simple-property>
<c:simple-property name="sendToDLAOnNoRoute" default="false" type="boolean"
- displayName="Send To DLA on no route" required="true">
- <c:description>Whether or not messages routed to this address gets sent to DLA when no consumers are available</c:description>
+ displayName="Send To dead letter address on no route" required="true">
+ <c:description>Whether or not messages routed to this address gets sent to dead letter address when no consumers are available</c:description>
</c:simple-property>
<c:simple-property name="addressFullMessagePolicy" default="PAGE" type="string"
displayName="Address Full Message Policy" required="true">
@@ -642,7 +642,7 @@
readOnly="true"
default="0" type="integer"
displayName="Discovery Port">
- <c:description>port to listen on to discover which connectors this connection factory can use</c:description>
+ <c:description>port to listen on to discover which connectors this connection factory can use. Should be used when 'Discovery Address' is set and greater 0</c:description>
</c:simple-property>
<c:simple-property name="DiscoveryRefreshTimeout"
default="10000" type="long"
13 years, 10 months
JBoss hornetq SVN: r9319 - projects/jopr-plugin/trunk/src/resources/META-INF.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2010-06-15 06:32:20 -0400 (Tue, 15 Jun 2010)
New Revision: 9319
Modified:
projects/jopr-plugin/trunk/src/resources/META-INF/rhq-plugin.xml
Log:
fix group id attr
Modified: projects/jopr-plugin/trunk/src/resources/META-INF/rhq-plugin.xml
===================================================================
--- projects/jopr-plugin/trunk/src/resources/META-INF/rhq-plugin.xml 2010-06-15 10:30:14 UTC (rev 9318)
+++ projects/jopr-plugin/trunk/src/resources/META-INF/rhq-plugin.xml 2010-06-15 10:32:20 UTC (rev 9319)
@@ -780,10 +780,9 @@
<c:description>maximum size of the thread pool, -1 means unlimited</c:description>
</c:simple-property>
<c:simple-property name="GroupID"
- default="false" type="boolean"
required="false"
displayName="Group ID">
- <c:description>group ID that will be eventually set on each message, default is false.</c:description>
+ <c:description>group ID that will be eventually set on each message, default is no group id.</c:description>
</c:simple-property>
<c:simple-property name="InitialMessagePacketSize"
default="1500" type="integer"
13 years, 10 months
JBoss hornetq SVN: r9318 - projects/jopr-plugin/trunk.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2010-06-15 06:30:14 -0400 (Tue, 15 Jun 2010)
New Revision: 9318
Modified:
projects/jopr-plugin/trunk/pom.xml
Log:
updated version number
Modified: projects/jopr-plugin/trunk/pom.xml
===================================================================
--- projects/jopr-plugin/trunk/pom.xml 2010-06-15 10:23:36 UTC (rev 9317)
+++ projects/jopr-plugin/trunk/pom.xml 2010-06-15 10:30:14 UTC (rev 9318)
@@ -5,7 +5,7 @@
<groupId>org.hornetq</groupId>
<artifactId>hornetq-jopr-plugin</artifactId>
<packaging>jar</packaging>
- <version>1.0.0.BETA1</version>
+ <version>1.0.0.CR1</version>
<name>JBoss Application Server JOPR plugin</name>
<url>http://hornetq.org</url>
<description>HornetQ JOPR plugin</description>
13 years, 10 months
JBoss hornetq SVN: r9317 - projects/jopr-plugin/trunk/src/resources/META-INF.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2010-06-15 06:23:36 -0400 (Tue, 15 Jun 2010)
New Revision: 9317
Modified:
projects/jopr-plugin/trunk/src/resources/META-INF/rhq-plugin.xml
Log:
fixed descriptions for topic creation template
Modified: projects/jopr-plugin/trunk/src/resources/META-INF/rhq-plugin.xml
===================================================================
--- projects/jopr-plugin/trunk/src/resources/META-INF/rhq-plugin.xml 2010-06-15 09:41:51 UTC (rev 9316)
+++ projects/jopr-plugin/trunk/src/resources/META-INF/rhq-plugin.xml 2010-06-15 10:23:36 UTC (rev 9317)
@@ -423,7 +423,7 @@
description="list all the messages.">
<parameters>
<c:simple-property required="true" name="queueName"
- displayName="the name of the queue representing a subscription"/>
+ displayName="Durable Subscription Name" description="The name of the durable subscription"/>
</parameters>
<results>
<c:list-property name="result">
@@ -440,10 +440,10 @@
<operation name="countMessagesForSubscription" displayName="List Messages for Subscription"
description="Count the number of messages matching the filter for the given subscription.">
<parameters>
- <c:simple-property required="true" name="clientID" displayName="the client ID"/>
+ <c:simple-property required="true" name="clientID" displayName="Client ID" description="The client ID of the durable subscriber"/>
<c:simple-property required="true" name="subscriptionName"
- displayName="Durable Subscription Name"/>
- <c:simple-property required="false" name="filter" displayName="JMS Selector (can be empty)"/>
+ displayName="Durable Subscription Name" description="The name of the durable subscription"/>
+ <c:simple-property required="false" name="selector" displayName="JMS Selector" description="JMS Selector to match against, default null means count all messages"/>
</parameters>
<results>
<c:simple-property name="operationResult" description="Message Subscriptions."/>
@@ -452,9 +452,9 @@
<operation name="dropDurableSubscription" displayName="Drop Durable Subscription"
description="Drop a durable subscription.">
<parameters>
- <c:simple-property required="true" name="clientID" displayName="The Client ID"/>
+ <c:simple-property required="true" name="clientID" displayName="Client ID" description="The client ID of the durable subscriber"/>
<c:simple-property required="true" name="subscriptionName"
- displayName="Durable Subscription Name"/>
+ displayName="Durable Subscription Name" description="The name of the durable subscription"/>
</parameters>
</operation>
<operation name="dropAllSubscriptions" displayName="Drop Durable Subscriptions"
@@ -497,7 +497,7 @@
<c:description>The address to route messages to once the message has been delivered more than the configured number of times. This is specified by 'Max Delivery Attempts'. The default is no DLA</c:description>
</c:simple-property>
<c:simple-property name="expiryAddress" displayName="Expiry Address" required="false">
- <c:description>The Address to route messages to once they have expired. The default id no expiry address</c:description>
+ <c:description>The Address to route messages to once they have expired. The default is no expiry address</c:description>
</c:simple-property>
<c:simple-property name="maxSize" default="-1" type="integer" displayName="Max Size of Address"
required="true">
13 years, 10 months