[jboss-cvs] JBossAS SVN: r103026 - in trunk/hornetq-int/src: resources/META-INF and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 26 06:24:57 EDT 2010
Author: ataylor
Date: 2010-03-26 06:24:57 -0400 (Fri, 26 Mar 2010)
New Revision: 103026
Modified:
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSConnectionFactoryDiscoveryComponent.java
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueComponent.java
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueDiscoveryComponent.java
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicDiscoveryComponent.java
trunk/hornetq-int/src/resources/META-INF/rhq-plugin.xml
Log:
hornetq plugin fixes
Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSConnectionFactoryDiscoveryComponent.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSConnectionFactoryDiscoveryComponent.java 2010-03-26 10:07:20 UTC (rev 103025)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSConnectionFactoryDiscoveryComponent.java 2010-03-26 10:24:57 UTC (rev 103026)
@@ -17,7 +17,6 @@
import org.jboss.managed.api.ManagedOperation;
import org.jboss.metatype.api.values.ArrayValueSupport;
import org.jboss.metatype.api.values.SimpleValueSupport;
-import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
@@ -48,7 +47,6 @@
for (int i = 0; i < value.getLength(); i++)
{
- Configuration configuration = new Configuration();
SimpleValueSupport queue = (SimpleValueSupport) value.getValue(i);
ResourceType resourceType = resourceDiscoveryContext.getResourceType();
String queueName = queue.getValue().toString();
@@ -57,7 +55,7 @@
queueName,
"a JMS ConnectionFactory",
"",
- configuration,
+ resourceDiscoveryContext.getDefaultPluginConfiguration(),
null));
}
return set;
Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueComponent.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueComponent.java 2010-03-26 10:07:20 UTC (rev 103025)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueComponent.java 2010-03-26 10:24:57 UTC (rev 103026)
@@ -171,6 +171,10 @@
private void createRoles(ConfigurationUpdateReport configurationUpdateReport, String name, StringBuffer sendRoles, StringBuffer consumeRoles)
{
PropertyList propertyList = (PropertyList) configurationUpdateReport.getConfiguration().get("securityConfig");
+ if(propertyList == null)
+ {
+ return;
+ }
List<Property> roles = propertyList.getList();
for (Property role : roles)
{
Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueDiscoveryComponent.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueDiscoveryComponent.java 2010-03-26 10:07:20 UTC (rev 103025)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueDiscoveryComponent.java 2010-03-26 10:24:57 UTC (rev 103026)
@@ -26,7 +26,6 @@
import org.jboss.managed.api.ManagedOperation;
import org.jboss.metatype.api.values.ArrayValueSupport;
import org.jboss.metatype.api.values.SimpleValueSupport;
-import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
@@ -53,7 +52,6 @@
for (int i = 0; i < value.getLength(); i++)
{
- Configuration configuration = new Configuration();
SimpleValueSupport queue = (SimpleValueSupport) value.getValue(i);
ResourceType resourceType = resourceDiscoveryContext.getResourceType();
String queueName = "jms.queue." + queue.getValue();
@@ -62,7 +60,7 @@
queueName,
"a JMS Queue",
"",
- configuration,
+ resourceDiscoveryContext.getDefaultPluginConfiguration(),
null));
}
return set;
Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicDiscoveryComponent.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicDiscoveryComponent.java 2010-03-26 10:07:20 UTC (rev 103025)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicDiscoveryComponent.java 2010-03-26 10:24:57 UTC (rev 103026)
@@ -26,7 +26,6 @@
import org.jboss.managed.api.ManagedOperation;
import org.jboss.metatype.api.values.ArrayValueSupport;
import org.jboss.metatype.api.values.SimpleValueSupport;
-import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
@@ -54,7 +53,6 @@
for (int i = 0; i < value.getLength(); i++)
{
- Configuration configuration = new Configuration();
SimpleValueSupport queue = (SimpleValueSupport) value.getValue(i);
ResourceType resourceType = resourceDiscoveryContext.getResourceType();
String queueName = "jms.topic." + queue.getValue();
@@ -63,7 +61,7 @@
queueName,
"a JMS Topic",
"",
- configuration,
+ resourceDiscoveryContext.getDefaultPluginConfiguration(),
null));
}
return set;
Modified: trunk/hornetq-int/src/resources/META-INF/rhq-plugin.xml
===================================================================
--- trunk/hornetq-int/src/resources/META-INF/rhq-plugin.xml 2010-03-26 10:07:20 UTC (rev 103025)
+++ trunk/hornetq-int/src/resources/META-INF/rhq-plugin.xml 2010-03-26 10:24:57 UTC (rev 103026)
@@ -19,10 +19,6 @@
displayName="Temporary"
description="If this queue is Temporary"
dataType="trait" displayType="summary"/>
- <metric property="getMessageCount"
- displayName="Message Count"
- description="number of messages currently in this destination"
- dataType="trait" displayType="summary"/>
'>
]>
@@ -35,7 +31,6 @@
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
- <depends plugin="JMX" useClasses="true"/>
<service name="JMS Manager"
discovery="JMSManagerDiscoveryComponent"
class="JMSManagerComponent"
@@ -44,7 +39,6 @@
<runs-inside>
<parent-resource-type name="JBossAS Server" plugin="JBossAS"/>
<parent-resource-type name="JBossAS Server" plugin="JBossAS5"/>
- <parent-resource-type name="JBossAS Server" plugin="JBossAS6"/>
</runs-inside>
<service name="JMS Queue"
@@ -211,23 +205,23 @@
&destinationMetrics;
<metric property="getMessageCount"
displayName="Message Count"
- description="number of messages currently in this destination"
+ description="number of messages currently held in this queue awaiting delivery"
dataType="measurement" displayType="summary"/>
<metric property="getScheduledCount"
- displayName="Scheduled Count"
- description="number of scheduled messages in this queue"
+ displayName="Scheduled Message Count"
+ description="number of scheduled messages in this queue awaiting scheduled delivery"
dataType="measurement" displayType="summary"/>
<metric property="getConsumerCount"
displayName="Consumer Count"
- description="number of consumers consuming messages from this queue"
+ description="number of consumers currently consuming messages from this queue"
dataType="measurement" displayType="summary"/>
<metric property="getDeliveringCount"
displayName="Delivering Count"
- description="number of messages that this queue is currently delivering to its consumers"
+ description="number of messages that this queue is currently delivering to its consumers that have not been acknowledged"
dataType="measurement" displayType="summary"/>
<metric property="getMessagesAdded"
displayName="Messages Added"
- description="number of messages added to this queue since it was created"
+ description="number of messages added to this queue since it was initially created"
dataType="measurement" displayType="summary"/>
<metric property="isPaused"
displayName="paused"
@@ -235,21 +229,21 @@
dataType="trait" displayType="summary"/>
<resource-configuration>
<c:group name="HornetQCustomProperties" displayName="Destination Options">
- <c:simple-property name="name" displayName="The Queues Name" required="true" readOnly="true">
- <c:description>The Name of the queue to deploy</c:description>
+ <c:simple-property name="name" displayName="Name" required="true" readOnly="true">
+ <c:description>The name of the queue</c:description>
</c:simple-property>
- <c:simple-property name="jndiBindings" displayName="The Queues JNDI Name" required="true" readOnly="true">
- <c:description>The JNDI Name of the queue to deploy</c:description>
+ <c:simple-property name="jndiBindings" displayName="JNDI Name" required="true" readOnly="true">
+ <c:description>The JNDI name of the queue. This will be used when looking up the queue using the naming server</c:description>
</c:simple-property>
<c:simple-property name="dla" displayName="Dead Letter Address" required="false">
- <c:description>The Address to route dead messages to</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'</c:description>
</c:simple-property>
<c:simple-property name="expiryAddress" displayName="Expiry Address" required="false">
- <c:description>The Address to route dead messages to</c:description>
+ <c:description>The Address to route messages to once they have expired.</c:description>
</c:simple-property>
- <c:simple-property name="maxSize" default="10485760" type="integer" displayName="Max Size of Address"
+ <c:simple-property name="maxSize" default="-1" type="integer" displayName="Max Size of Address"
required="true">
- <c:description>The maximum size in bytes an address can hold</c:description>
+ <c:description>The maximum size in bytes of messages that can be delivered to this queue. -1 means no limit, if limit is set then 'Address Full Message Policy' specifies what should happen</c:description>
</c:simple-property>
<c:simple-property name="pageSize" default="10485760" type="integer" displayName="Page Size"
required="true">
@@ -257,30 +251,27 @@
</c:simple-property>
<c:simple-property name="maxDeliveryAttempts" type="integer" default="10"
displayName="Max Delivery Attempts" required="true">
- <c:description>The maximum time to attempt delivery to this Address</c:description>
+ <c:description>The maximum time to attempt delivery of a message to a consumer, once hit the message is routed to which ever address is specified by 'Dead Letter Address'</c:description>
</c:simple-property>
<c:simple-property name="redeliveryDelay" type="long" default="0" displayName="Redelivery Delay"
required="true">
- <c:description>The delay before re routing a message to this Address</c:description>
+ <c:description>The delay (in milli seconds) before re routing a message to this Address after an unsuccessful delivery attempt has occurred. default 0 means no delay</c:description>
</c:simple-property>
<c:simple-property name="lastValueQueue" default="false" type="boolean" displayName="Last Value Queue"
required="true">
- <c:description>Is this queue a last value queue</c:description>
+ <c:description>Is this queue a last value queue. A last value queue can only ever contain a single message for each value for the message property '_HQ_LVQ_NAME'.</c:description>
</c:simple-property>
<c:simple-property name="redistributionDelay" default="-1" type="long" displayName="Redistribution Delay"
required="true">
- <c:description>How long to wait before redistributing messages to another node when clustered
- </c:description>
+ <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>
+ <c:description>Whether or not messages routed to this address gets sent to DLA 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">
- <c:description>The policy to use when this Address is full (PAGE,DROP,BLOCK)</c:description>
+ <c:description>The policy to use when this Address is full. PAGE means that the message will be paged, DROP means that messages are just droppoed and BLOCK means that the client will block on send until the queue clears some messages</c:description>
<c:property-options>
<c:option name="PAGE" value="PAGE"/>
<c:option name="DROP" value="DROP"/>
@@ -431,21 +422,21 @@
dataType="measurement" displayType="summary"/>
<resource-configuration>
<c:group name="HornetQCustomProperties" displayName="Destination Options">
- <c:simple-property name="name" displayName="The Queues Name" required="true" readOnly="true">
- <c:description>The Name of the queue to deploy</c:description>
+ <c:simple-property name="name" displayName="Name" required="true" readOnly="true">
+ <c:description>The Name of the topic to deploy</c:description>
</c:simple-property>
- <c:simple-property name="jndiBindings" displayName="The Queues JNDI Name" required="true" readOnly="true">
- <c:description>The JNDI Name of the queue to deploy</c:description>
+ <c:simple-property name="jndiBindings" displayName="JNDI Name" required="true" readOnly="true">
+ <c:description>The JNDI name of the queue. This will be used when looking up the queue using the naming server</c:description>
</c:simple-property>
<c:simple-property name="dla" displayName="Dead Letter Address" required="false">
- <c:description>The Address to route dead messages to</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'</c:description>
</c:simple-property>
<c:simple-property name="expiryAddress" displayName="Expiry Address" required="false">
- <c:description>The Address to route dead messages to</c:description>
+ <c:description>The Address to route messages to once they have expired.</c:description>
</c:simple-property>
- <c:simple-property name="maxSize" default="10485760" type="integer" displayName="Max Size of Address"
+ <c:simple-property name="maxSize" default="-1" type="integer" displayName="Max Size of Address"
required="true">
- <c:description>The maximum size in bytes an address can hold</c:description>
+ <c:description>The maximum size in bytes of messages that can be delivered to this queue. -1 means no limit, if limit is set then 'Address Full Message Policy' specifies what should happen</c:description>
</c:simple-property>
<c:simple-property name="pageSize" default="10485760" type="integer" displayName="Page Size"
required="true">
@@ -453,30 +444,27 @@
</c:simple-property>
<c:simple-property name="maxDeliveryAttempts" type="integer" default="10"
displayName="Max Delivery Attempts" required="true">
- <c:description>The maximum time to attempt delivery to this Address</c:description>
+ <c:description>The maximum time to attempt delivery of a message to a consumer, once hit the message is routed to which ever address is specified by 'Dead Letter Address'</c:description>
</c:simple-property>
<c:simple-property name="redeliveryDelay" type="long" default="0" displayName="Redelivery Delay"
required="true">
- <c:description>The delay before re routing a message to this Address</c:description>
+ <c:description>The delay (in milli seconds) before re routing a message to this Address after an unsuccessful delivery attempt has occurred. default 0 means no delay</c:description>
</c:simple-property>
<c:simple-property name="lastValueQueue" default="false" type="boolean" displayName="Last Value Queue"
required="true">
- <c:description>Is this queue a last value queue</c:description>
+ <c:description>Is this queue a last value queue. A last value queue can only ever contain a single message for each value for the message property '_HQ_LVQ_NAME'.</c:description>
</c:simple-property>
<c:simple-property name="redistributionDelay" default="-1" type="long" displayName="Redistribution Delay"
required="true">
- <c:description>How long to wait before redistributing messages to another node when clustered
- </c:description>
+ <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>
+ <c:description>Whether or not messages routed to this address gets sent to DLA 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">
- <c:description>The policy to use when this Address is full (PAGE,DROP,BLOCK)</c:description>
+ <c:description>The policy to use when this Address is full. PAGE means that the message will be paged, DROP means that messages are just droppoed and BLOCK means that the client will block on send until the queue clears some messages</c:description>
<c:property-options>
<c:option name="PAGE" value="PAGE"/>
<c:option name="DROP" value="DROP"/>
More information about the jboss-cvs-commits
mailing list