Author: ataylor
Date: 2011-02-09 07:46:44 -0500 (Wed, 09 Feb 2011)
New Revision: 10191
Modified:
projects/jopr-plugin/trunk/pom.xml
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/JMSQueueComponent.java
projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicComponent.java
projects/jopr-plugin/trunk/src/resources/META-INF/rhq-plugin.xml
Log:
added support for new address settings and added versioning info po manifest
Modified: projects/jopr-plugin/trunk/pom.xml
===================================================================
--- projects/jopr-plugin/trunk/pom.xml 2011-02-09 02:31:45 UTC (rev 10190)
+++ projects/jopr-plugin/trunk/pom.xml 2011-02-09 12:46:44 UTC (rev 10191)
@@ -5,7 +5,7 @@
<groupId>org.hornetq</groupId>
<artifactId>hornetq-jopr-plugin</artifactId>
<packaging>jar</packaging>
- <version>2.0.0.CR1</version>
+ <version>2.0.0.CR2</version>
<name>JBoss Application Server JOPR plugin</name>
<url>http://hornetq.org</url>
<description>HornetQ JOPR plugin</description>
@@ -58,11 +58,16 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- </configuration>
- </plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
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 2011-02-09
02:31:45 UTC (rev 10190)
+++
projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSManagerComponent.java 2011-02-09
12:46:44 UTC (rev 10191)
@@ -138,6 +138,7 @@
String expiryAddress =
simpleProps.get("expiryAddress").getStringValue();
int maxSize = simpleProps.get("maxSize").getIntegerValue();
int pageSize = simpleProps.get("pageSize").getIntegerValue();
+ int pageMaxCacheSize =
simpleProps.get("pageMaxCacheSize").getIntegerValue();
int maxDeliveryAttempts =
simpleProps.get("maxDeliveryAttempts").getIntegerValue();
long redeliveryDelay =
simpleProps.get("redeliveryDelay").getLongValue();
boolean lastValueQueue =
simpleProps.get("lastValueQueue").getBooleanValue();
@@ -146,11 +147,11 @@
String addressFullMessagePolicy =
simpleProps.get("addressFullMessagePolicy").getStringValue();
if ("JMS
Queue".equalsIgnoreCase(createResourceReport.getResourceType().getName()))
{
- createQueue(createResourceReport, managementView, name, jndiName, DLA,
expiryAddress, maxSize, pageSize, maxDeliveryAttempts, redeliveryDelay, lastValueQueue,
redistributionDelay, sendToDLAOnNoRoute, addressFullMessagePolicy);
+ createQueue(createResourceReport, managementView, name, jndiName, DLA,
expiryAddress, maxSize, pageSize, pageMaxCacheSize, maxDeliveryAttempts, redeliveryDelay,
lastValueQueue, redistributionDelay, sendToDLAOnNoRoute, addressFullMessagePolicy);
}
else if ("JMS
Topic".equalsIgnoreCase(createResourceReport.getResourceType().getName()))
{
- createTopic(createResourceReport, managementView, name, jndiName, DLA,
expiryAddress, maxSize, pageSize, maxDeliveryAttempts, redeliveryDelay, lastValueQueue,
redistributionDelay, sendToDLAOnNoRoute, addressFullMessagePolicy);
+ createTopic(createResourceReport, managementView, name, jndiName, DLA,
expiryAddress, maxSize, pageSize, pageMaxCacheSize, maxDeliveryAttempts, redeliveryDelay,
lastValueQueue, redistributionDelay, sendToDLAOnNoRoute, addressFullMessagePolicy);
}
}
@@ -255,7 +256,7 @@
createResourceReport.setResourceName(name);
}
- private void createQueue(CreateResourceReport createResourceReport, ManagementView
managementView, String name, String jndiName, String DLA, String expiryAddress, int
maxSize, int pageSize, int maxDeliveryAttempts, long redeliveryDelay, boolean
lastValueQueue, long redistributionDelay, boolean sendToDLAOnNoRoute, String
addressFullMessagePolicy)
+ private void createQueue(CreateResourceReport createResourceReport, ManagementView
managementView, String name, String jndiName, String DLA, String expiryAddress, int
maxSize, int pageSize, int pageMaxCacheSize, int maxDeliveryAttempts, long
redeliveryDelay, boolean lastValueQueue, long redistributionDelay, boolean
sendToDLAOnNoRoute, String addressFullMessagePolicy)
throws Exception
{
ManagedOperation operation = ManagementSupport.getOperation(managementView,
JMSConstants.Queue.COMPONENT_NAME, "createQueue",
JMSConstants.Queue.COMPONENT_TYPE);
@@ -270,6 +271,7 @@
new SimpleValueSupport(SimpleMetaType.STRING, expiryAddress),
new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE, maxSize),
new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE, pageSize),
+ new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE, pageMaxCacheSize),
new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE,
maxDeliveryAttempts),
new SimpleValueSupport(SimpleMetaType.LONG_PRIMITIVE, redeliveryDelay),
new SimpleValueSupport(SimpleMetaType.BOOLEAN_PRIMITIVE, lastValueQueue),
@@ -283,7 +285,7 @@
createResourceReport.setResourceName("jms.queue." + name);
}
- private void createTopic(CreateResourceReport createResourceReport, ManagementView
managementView, String name, String jndiName, String DLA, String expiryAddress, int
maxSize, int pageSize, int maxDeliveryAttempts, long redeliveryDelay, boolean
lastValueQueue, long redistributionDelay, boolean sendToDLAOnNoRoute, String
addressFullMessagePolicy)
+ private void createTopic(CreateResourceReport createResourceReport, ManagementView
managementView, String name, String jndiName, String DLA, String expiryAddress, int
maxSize, int pageSize, int pageMaxCacheSize, int maxDeliveryAttempts, long
redeliveryDelay, boolean lastValueQueue, long redistributionDelay, boolean
sendToDLAOnNoRoute, String addressFullMessagePolicy)
throws Exception
{
ManagedOperation operation = ManagementSupport.getOperation(managementView,
JMSConstants.Topic.COMPONENT_NAME,
@@ -303,6 +305,7 @@
new SimpleValueSupport(SimpleMetaType.STRING, expiryAddress),
new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE, maxSize),
new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE, pageSize),
+ new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE, pageMaxCacheSize),
new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE,
maxDeliveryAttempts),
new SimpleValueSupport(SimpleMetaType.LONG_PRIMITIVE, redeliveryDelay),
new SimpleValueSupport(SimpleMetaType.BOOLEAN_PRIMITIVE, lastValueQueue),
Modified:
projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueComponent.java
===================================================================
---
projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueComponent.java 2011-02-09
02:31:45 UTC (rev 10190)
+++
projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueComponent.java 2011-02-09
12:46:44 UTC (rev 10191)
@@ -140,6 +140,7 @@
String expiryAddress =
simpleProps.get("expiryAddress").getStringValue();
int maxSize = simpleProps.get("maxSize").getIntegerValue();
int pageSize = simpleProps.get("pageSize").getIntegerValue();
+ int pageMaxCacheSize =
simpleProps.get("pageMaxCacheSize").getIntegerValue();
int maxDeliveryAttempts =
simpleProps.get("maxDeliveryAttempts").getIntegerValue();
long redeliveryDelay =
simpleProps.get("redeliveryDelay").getLongValue();
boolean lastValueQueue =
simpleProps.get("lastValueQueue").getBooleanValue();
@@ -160,6 +161,7 @@
new SimpleValueSupport(SimpleMetaType.STRING, expiryAddress),
new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE, maxSize),
new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE, pageSize),
+ new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE, pageMaxCacheSize),
new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE,
maxDeliveryAttempts),
new SimpleValueSupport(SimpleMetaType.LONG_PRIMITIVE, redeliveryDelay),
new SimpleValueSupport(SimpleMetaType.BOOLEAN_PRIMITIVE, lastValueQueue),
Modified:
projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicComponent.java
===================================================================
---
projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicComponent.java 2011-02-09
02:31:45 UTC (rev 10190)
+++
projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicComponent.java 2011-02-09
12:46:44 UTC (rev 10191)
@@ -117,6 +117,7 @@
String expiryAddress =
simpleProps.get("expiryAddress").getStringValue();
int maxSize = simpleProps.get("maxSize").getIntegerValue();
int pageSize = simpleProps.get("pageSize").getIntegerValue();
+ int pageMaxCacheSize =
simpleProps.get("pageMaxCacheSize").getIntegerValue();
int maxDeliveryAttempts =
simpleProps.get("maxDeliveryAttempts").getIntegerValue();
long redeliveryDelay =
simpleProps.get("redeliveryDelay").getLongValue();
boolean lastValueQueue =
simpleProps.get("lastValueQueue").getBooleanValue();
@@ -142,6 +143,7 @@
new SimpleValueSupport(SimpleMetaType.STRING, expiryAddress),
new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE, maxSize),
new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE, pageSize),
+ new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE, pageMaxCacheSize),
new SimpleValueSupport(SimpleMetaType.INTEGER_PRIMITIVE,
maxDeliveryAttempts),
new SimpleValueSupport(SimpleMetaType.LONG_PRIMITIVE, redeliveryDelay),
new SimpleValueSupport(SimpleMetaType.BOOLEAN_PRIMITIVE, lastValueQueue),
Modified: projects/jopr-plugin/trunk/src/resources/META-INF/rhq-plugin.xml
===================================================================
--- projects/jopr-plugin/trunk/src/resources/META-INF/rhq-plugin.xml 2011-02-09 02:31:45
UTC (rev 10190)
+++ projects/jopr-plugin/trunk/src/resources/META-INF/rhq-plugin.xml 2011-02-09 12:46:44
UTC (rev 10191)
@@ -26,7 +26,6 @@
displayName="HornetQPlugin"
description="Supports management and monitoring of HornetQ Servers"
package="org.jboss.as.integration.hornetq.jopr"
- version="2.1.10"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
@@ -309,6 +308,10 @@
required="true">
<c:description>The size in bytes that an address can reach before
paging starts. -1 means no limit.</c:description>
</c:simple-property>
+ <c:simple-property name="pageMaxCacheSize"
default="5" type="integer" displayName="Page Cache Max
Size"
+ required="true">
+ <c:description>The max number of pages in the soft memory
cache.</c:description>
+ </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 of a message
to a consumer, once hit the message is routed to which ever address is specified by
'Dead Letter Address'</c:description>
@@ -506,6 +509,10 @@
required="true">
<c:description>The size in bytes an address can reach before
paging occurs</c:description>
</c:simple-property>
+ <c:simple-property name="pageMaxCacheSize"
default="5" type="integer" displayName="Page Cache Max
Size"
+ required="true">
+ <c:description>The max number of pages in the soft memory
cache.</c:description>
+ </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 of a message
to a consumer, once hit the message is routed to which ever address is specified by
'Dead Letter Address'</c:description>