[jboss-cvs] JBossAS SVN: r60439 - in trunk/varia/src/resources/services/deployment/templates: jms-queue/vm and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 8 16:31:33 EST 2007
Author: chilin
Date: 2007-02-08 16:31:33 -0500 (Thu, 08 Feb 2007)
New Revision: 60439
Modified:
trunk/varia/src/resources/services/deployment/templates/jms-queue/template-config.xml
trunk/varia/src/resources/services/deployment/templates/jms-queue/vm/jms-queue.xml.vm
trunk/varia/src/resources/services/deployment/templates/jms-topic/template-config.xml
trunk/varia/src/resources/services/deployment/templates/jms-topic/vm/jms-topic.xml.vm
Log:
Updated templates to support JBoss Messaging 1.2.0 Beta2.
Modified: trunk/varia/src/resources/services/deployment/templates/jms-queue/template-config.xml
===================================================================
--- trunk/varia/src/resources/services/deployment/templates/jms-queue/template-config.xml 2007-02-08 20:44:47 UTC (rev 60438)
+++ trunk/varia/src/resources/services/deployment/templates/jms-queue/template-config.xml 2007-02-08 21:31:33 UTC (rev 60439)
@@ -13,25 +13,36 @@
<!-- a value must be supplied at runtime, or an exception will be thrown -->
<property name="Name"/>
- <property name="JNDIName" type="java.lang.String" optional="true">
- <description>The JNDI name under which the queue will be bound.</description>
- </property>
+ <property name="JNDIName" type="java.lang.String" optional="true"/>
- <property name="DownCacheSize" type="java.lang.Integer" optional="true">
- <description>The write-cache size.</description>
- <default-value>2000</default-value>
+ <property name="DLQ" type="java.lang.String" optional="true"/>
+
+ <property name="ExpiryQueue" type="java.lang.String" optional="true"/>
+
+ <property name="RedeliveryDelay" type="java.lang.Long" optional="true"/>
+
+ <property name="MaxSize" type="java.lang.Integer" optional="true">
+ <default-value>-1</default-value>
</property>
<property name="FullSize" type="java.lang.Integer" optional="true">
- <description>The in-memory message limit.</description>
<default-value>75000</default-value>
</property>
<property name="PageSize" type="java.lang.Integer" optional="true">
- <description>The paging size.</description>
<default-value>2000</default-value>
</property>
+ <property name="DownCacheSize" type="java.lang.Integer" optional="true">
+ <default-value>2000</default-value>
+ </property>
+
+ <property name="Clustered" type="java.lang.Boolean" optional="true"/>
+
+ <property name="MessageCounterHistoryDayLimit" type="java.lang.Integer" optional="true">
+ <default-value>-1</default-value>
+ </property>
+
<!-- arrays and generally any valid java/user class is permitted -->
<property name="SecurityRoles" type="[Ljava.lang.String;" optional="true"/>
Modified: trunk/varia/src/resources/services/deployment/templates/jms-queue/vm/jms-queue.xml.vm
===================================================================
--- trunk/varia/src/resources/services/deployment/templates/jms-queue/vm/jms-queue.xml.vm 2007-02-08 20:44:47 UTC (rev 60438)
+++ trunk/varia/src/resources/services/deployment/templates/jms-queue/vm/jms-queue.xml.vm 2007-02-08 21:31:33 UTC (rev 60439)
@@ -10,20 +10,33 @@
<loader-repository-config>java2ParentDelegation=false</loader-repository-config>
</loader-repository>
- <mbean code="org.jboss.jms.server.destination.Queue"
+ <mbean code="org.jboss.jms.server.destination.QueueService"
name="jboss.messaging.destination:name=${Name},service=Queue"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
#if(${JNDIName})
<attribute name="JNDIName">${JNDIName}</attribute>
#end
-#if(${DownCacheSize})
- <attribute name="DownCacheSize">${DownCacheSize}</attribute>
+#if(${DLQ})
+ <attribute name="DLQ">${DLQ}</attribute>
#end
+#if(${ExpiryQueue})
+ <attribute name="ExpiryQueue">${ExpiryQueue}</attribute>
+#end
+
+#if(${RedeliveryDelay})
+ <attribute name="RedeliveryDelay">${RedeliveryDelay}</attribute>
+#end
+
+#if(${MaxSize})
+ <attribute name="MaxSize">${MaxSize}</attribute>
+#end
+
#if(${FullSize})
<attribute name="FullSize">${FullSize}</attribute>
#end
@@ -32,6 +45,18 @@
<attribute name="PageSize">${PageSize}</attribute>
#end
+#if(${DownCacheSize})
+ <attribute name="DownCacheSize">${DownCacheSize}</attribute>
+#end
+
+#if(${Clustered})
+ <attribute name="Clustered">${Clustered}</attribute>
+#end
+
+#if(${MessageCounterHistoryDayLimit})
+ <attribute name="MessageCounterHistoryDayLimit">${MessageCounterHistoryDayLimit}</attribute>
+#end
+
#if(${SecurityRoles})
<attribute name="SecurityConfig">
<security>
Modified: trunk/varia/src/resources/services/deployment/templates/jms-topic/template-config.xml
===================================================================
--- trunk/varia/src/resources/services/deployment/templates/jms-topic/template-config.xml 2007-02-08 20:44:47 UTC (rev 60438)
+++ trunk/varia/src/resources/services/deployment/templates/jms-topic/template-config.xml 2007-02-08 21:31:33 UTC (rev 60439)
@@ -9,32 +9,43 @@
<template-config template="vm/jms-topic.xml.vm" extension="-service.xml">
<property-list>
- <!-- if type not specified, java.lang.String is assumed -->
- <!-- a value must be supplied at runtime, or an exception will be thrown -->
- <property name="Name"/>
-
- <property name="JNDIName" type="java.lang.String" optional="true">
- <description>The JNDI name under which the topic will be bound.</description>
- </property>
-
- <property name="DownCacheSize" type="java.lang.Integer" optional="true">
- <description>The write-cache size.</description>
- <default-value>2000</default-value>
- </property>
-
- <property name="FullSize" type="java.lang.Integer" optional="true">
- <description>The in-memory message limit.</description>
- <default-value>75000</default-value>
- </property>
-
- <property name="PageSize" type="java.lang.Integer" optional="true">
- <description>The paging size.</description>
- <default-value>2000</default-value>
- </property>
-
- <!-- arrays and generally any valid java/user class is permitted -->
- <property name="SecurityRoles" type="[Ljava.lang.String;" optional="true"/>
-
+ <!-- if type not specified, java.lang.String is assumed -->
+ <!-- a value must be supplied at runtime, or an exception will be thrown -->
+ <property name="Name"/>
+
+ <property name="JNDIName" type="java.lang.String" optional="true"/>
+
+ <property name="DLQ" type="java.lang.String" optional="true"/>
+
+ <property name="ExpiryQueue" type="java.lang.String" optional="true"/>
+
+ <property name="RedeliveryDelay" type="java.lang.Long" optional="true"/>
+
+ <property name="MaxSize" type="java.lang.Integer" optional="true">
+ <default-value>-1</default-value>
+ </property>
+
+ <property name="FullSize" type="java.lang.Integer" optional="true">
+ <default-value>75000</default-value>
+ </property>
+
+ <property name="PageSize" type="java.lang.Integer" optional="true">
+ <default-value>2000</default-value>
+ </property>
+
+ <property name="DownCacheSize" type="java.lang.Integer" optional="true">
+ <default-value>2000</default-value>
+ </property>
+
+ <property name="Clustered" type="java.lang.Boolean" optional="true"/>
+
+ <property name="MessageCounterHistoryDayLimit" type="java.lang.Integer" optional="true">
+ <default-value>-1</default-value>
+ </property>
+
+ <!-- arrays and generally any valid java/user class is permitted -->
+ <property name="SecurityRoles" type="[Ljava.lang.String;" optional="true"/>
+
</property-list>
</template-config>
\ No newline at end of file
Modified: trunk/varia/src/resources/services/deployment/templates/jms-topic/vm/jms-topic.xml.vm
===================================================================
--- trunk/varia/src/resources/services/deployment/templates/jms-topic/vm/jms-topic.xml.vm 2007-02-08 20:44:47 UTC (rev 60438)
+++ trunk/varia/src/resources/services/deployment/templates/jms-topic/vm/jms-topic.xml.vm 2007-02-08 21:31:33 UTC (rev 60439)
@@ -10,20 +10,33 @@
<loader-repository-config>java2ParentDelegation=false</loader-repository-config>
</loader-repository>
- <mbean code="org.jboss.jms.server.destination.Topic"
+ <mbean code="org.jboss.jms.server.destination.TopicService"
name="jboss.messaging.destination:name=${Name},service=Topic"
xmbean-dd="xmdesc/Topic-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
#if(${JNDIName})
<attribute name="JNDIName">${JNDIName}</attribute>
#end
-#if(${DownCacheSize})
- <attribute name="DownCacheSize">${DownCacheSize}</attribute>
+#if(${DLQ})
+ <attribute name="DLQ">${DLQ}</attribute>
#end
+#if(${ExpiryQueue})
+ <attribute name="ExpiryQueue">${ExpiryQueue}</attribute>
+#end
+
+#if(${RedeliveryDelay})
+ <attribute name="RedeliveryDelay">${RedeliveryDelay}</attribute>
+#end
+
+#if(${MaxSize})
+ <attribute name="MaxSize">${MaxSize}</attribute>
+#end
+
#if(${FullSize})
<attribute name="FullSize">${FullSize}</attribute>
#end
@@ -32,6 +45,18 @@
<attribute name="PageSize">${PageSize}</attribute>
#end
+#if(${DownCacheSize})
+ <attribute name="DownCacheSize">${DownCacheSize}</attribute>
+#end
+
+#if(${Clustered})
+ <attribute name="Clustered">${Clustered}</attribute>
+#end
+
+#if(${MessageCounterHistoryDayLimit})
+ <attribute name="MessageCounterHistoryDayLimit">${MessageCounterHistoryDayLimit}</attribute>
+#end
+
#if(${SecurityRoles})
<attribute name="SecurityConfig">
<security>
More information about the jboss-cvs-commits
mailing list