[hornetq-commits] JBoss hornetq SVN: r8959 - in trunk/src/config: jboss-6/non-clustered and 6 other directories.

Author: timfox Date: 2010-03-24 12:08:44 -0400 (Wed, 24 Mar 2010) New Revision: 8959 Modified: trunk/src/config/jboss-6/clustered/hornetq-configuration.xml trunk/src/config/jboss-6/non-clustered/hornetq-configuration.xml trunk/src/config/jboss-as/clustered/hornetq-configuration.xml trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml trunk/src/config/stand-alone/clustered/hornetq-configuration.xml trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml trunk/src/config/trunk/clustered/hornetq-configuration.xml trunk/src/config/trunk/non-clustered/hornetq-configuration.xml Log: fixed and made some changes to our default configs Modified: trunk/src/config/jboss-6/clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/jboss-6/clustered/hornetq-configuration.xml 2010-03-24 15:46:47 UTC (rev 8958) +++ trunk/src/config/jboss-6/clustered/hornetq-configuration.xml 2010-03-24 16:08:44 UTC (rev 8959) @@ -9,6 +9,8 @@ <bindings-directory>${jboss.server.data.dir}/hornetq/bindings</bindings-directory> <journal-directory>${jboss.server.data.dir}/hornetq/journal</journal-directory> + + <journal-min-files>10</journal-min-files> <large-messages-directory>${jboss.server.data.dir}/hornetq/largemessages</large-messages-directory> @@ -80,9 +82,9 @@ <dead-letter-address>jms.queue.DLQ</dead-letter-address> <expiry-address>jms.queue.ExpiryQueue</expiry-address> <redelivery-delay>0</redelivery-delay> - <max-size-bytes>-1</max-size-bytes> - <page-size-bytes>10485760</page-size-bytes> + <max-size-bytes>10485760</max-size-bytes> <message-counter-history-day-limit>10</message-counter-history-day-limit> + <address-full-policy>BLOCK</address-full-policy> </address-setting> </address-settings> Modified: trunk/src/config/jboss-6/non-clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/jboss-6/non-clustered/hornetq-configuration.xml 2010-03-24 15:46:47 UTC (rev 8958) +++ trunk/src/config/jboss-6/non-clustered/hornetq-configuration.xml 2010-03-24 16:08:44 UTC (rev 8959) @@ -7,6 +7,8 @@ <bindings-directory>${jboss.server.data.dir}/hornetq/bindings</bindings-directory> <journal-directory>${jboss.server.data.dir}/hornetq/journal</journal-directory> + + <journal-min-files>10</journal-min-files> <large-messages-directory>${jboss.server.data.dir}/hornetq/largemessages</large-messages-directory> @@ -54,9 +56,9 @@ <dead-letter-address>jms.queue.DLQ</dead-letter-address> <expiry-address>jms.queue.ExpiryQueue</expiry-address> <redelivery-delay>0</redelivery-delay> - <max-size-bytes>-1</max-size-bytes> - <page-size-bytes>10485760</page-size-bytes> + <max-size-bytes>10485760</max-size-bytes> <message-counter-history-day-limit>10</message-counter-history-day-limit> + <address-full-policy>BLOCK</address-full-policy> </address-setting> </address-settings> Modified: trunk/src/config/jboss-as/clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/jboss-as/clustered/hornetq-configuration.xml 2010-03-24 15:46:47 UTC (rev 8958) +++ trunk/src/config/jboss-as/clustered/hornetq-configuration.xml 2010-03-24 16:08:44 UTC (rev 8959) @@ -9,7 +9,9 @@ <bindings-directory>${jboss.server.data.dir}/hornetq/bindings</bindings-directory> <journal-directory>${jboss.server.data.dir}/hornetq/journal</journal-directory> - + + <journal-min-files>10</journal-min-files> + <large-messages-directory>${jboss.server.data.dir}/hornetq/largemessages</large-messages-directory> <paging-directory>${jboss.server.data.dir}/hornetq/paging</paging-directory> @@ -80,9 +82,9 @@ <dead-letter-address>jms.queue.DLQ</dead-letter-address> <expiry-address>jms.queue.ExpiryQueue</expiry-address> <redelivery-delay>0</redelivery-delay> - <max-size-bytes>-1</max-size-bytes> - <page-size-bytes>10485760</page-size-bytes> + <max-size-bytes>10485760</max-size-bytes> <message-counter-history-day-limit>10</message-counter-history-day-limit> + <address-full-policy>BLOCK</address-full-policy> </address-setting> </address-settings> Modified: trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml 2010-03-24 15:46:47 UTC (rev 8958) +++ trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml 2010-03-24 16:08:44 UTC (rev 8959) @@ -7,7 +7,9 @@ <bindings-directory>${jboss.server.data.dir}/hornetq/bindings</bindings-directory> <journal-directory>${jboss.server.data.dir}/hornetq/journal</journal-directory> - + + <journal-min-files>10</journal-min-files> + <large-messages-directory>${jboss.server.data.dir}/hornetq/largemessages</large-messages-directory> <paging-directory>${jboss.server.data.dir}/hornetq/paging</paging-directory> @@ -54,9 +56,9 @@ <dead-letter-address>jms.queue.DLQ</dead-letter-address> <expiry-address>jms.queue.ExpiryQueue</expiry-address> <redelivery-delay>0</redelivery-delay> - <max-size-bytes>-1</max-size-bytes> - <page-size-bytes>10485760</page-size-bytes> + <max-size-bytes>10485760</max-size-bytes> <message-counter-history-day-limit>10</message-counter-history-day-limit> + <address-full-policy>BLOCK</address-full-policy> </address-setting> </address-settings> Modified: trunk/src/config/stand-alone/clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/stand-alone/clustered/hornetq-configuration.xml 2010-03-24 15:46:47 UTC (rev 8958) +++ trunk/src/config/stand-alone/clustered/hornetq-configuration.xml 2010-03-24 16:08:44 UTC (rev 8959) @@ -3,6 +3,16 @@ xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> <clustered>true</clustered> + + <paging-directory>${data.dir:../data}/paging</paging-directory> + + <bindings-directory>${data.dir:../data}/bindings</bindings-directory> + + <journal-directory>${data.dir:../data}/journal</journal-directory> + + <journal-min-files>10</journal-min-files> + + <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory> <connectors> <connector name="netty"> @@ -59,15 +69,12 @@ <dead-letter-address>jms.queue.DLQ</dead-letter-address> <expiry-address>jms.queue.ExpiryQueue</expiry-address> <redelivery-delay>0</redelivery-delay> - <max-size-bytes>-1</max-size-bytes> - <page-size-bytes>10485760</page-size-bytes> + <max-size-bytes>10485760</max-size-bytes> <message-counter-history-day-limit>10</message-counter-history-day-limit> + <address-full-policy>BLOCK</address-full-policy> </address-setting> </address-settings> - <paging-directory>${data.dir:../data}/paging</paging-directory> - <bindings-directory>${data.dir:../data}/bindings</bindings-directory> - <journal-directory>${data.dir:../data}/journal</journal-directory> - <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory> + </configuration> Modified: trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml 2010-03-24 15:46:47 UTC (rev 8958) +++ trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml 2010-03-24 16:08:44 UTC (rev 8959) @@ -2,6 +2,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> + <paging-directory>${data.dir:../data}/paging</paging-directory> + + <bindings-directory>${data.dir:../data}/bindings</bindings-directory> + + <journal-directory>${data.dir:../data}/journal</journal-directory> + + <journal-min-files>10</journal-min-files> + + <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory> + <connectors> <connector name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> @@ -33,15 +43,10 @@ <dead-letter-address>jms.queue.DLQ</dead-letter-address> <expiry-address>jms.queue.ExpiryQueue</expiry-address> <redelivery-delay>0</redelivery-delay> - <max-size-bytes>-1</max-size-bytes> - <page-size-bytes>10485760</page-size-bytes> + <max-size-bytes>10485760</max-size-bytes> <message-counter-history-day-limit>10</message-counter-history-day-limit> + <address-full-policy>BLOCK</address-full-policy> </address-setting> </address-settings> - <paging-directory>../data/paging</paging-directory> - <bindings-directory>../data/bindings</bindings-directory> - <journal-directory>../data/journal</journal-directory> - <large-messages-directory>../data/large-messages</large-messages-directory> - </configuration> Modified: trunk/src/config/trunk/clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/trunk/clustered/hornetq-configuration.xml 2010-03-24 15:46:47 UTC (rev 8958) +++ trunk/src/config/trunk/clustered/hornetq-configuration.xml 2010-03-24 16:08:44 UTC (rev 8959) @@ -4,6 +4,8 @@ <clustered>true</clustered> + <journal-min-files>10</journal-min-files> + <connectors> <connector name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> @@ -53,16 +55,16 @@ </security-setting> </security-settings> - <address-settings> - <!--default for catch all--> - <address-setting match="#"> - <dead-letter-address>jms.queue.DLQ</dead-letter-address> - <expiry-address>jms.queue.ExpiryQueue</expiry-address> - <redelivery-delay>0</redelivery-delay> - <max-size-bytes>-1</max-size-bytes> - <page-size-bytes>10485760</page-size-bytes> - <message-counter-history-day-limit>10</message-counter-history-day-limit> - </address-setting> - </address-settings> + <address-settings> + <!--default for catch all--> + <address-setting match="#"> + <dead-letter-address>jms.queue.DLQ</dead-letter-address> + <expiry-address>jms.queue.ExpiryQueue</expiry-address> + <redelivery-delay>0</redelivery-delay> + <max-size-bytes>10485760</max-size-bytes> + <message-counter-history-day-limit>10</message-counter-history-day-limit> + <address-full-policy>BLOCK</address-full-policy> + </address-setting> + </address-settings> </configuration> Modified: trunk/src/config/trunk/non-clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/trunk/non-clustered/hornetq-configuration.xml 2010-03-24 15:46:47 UTC (rev 8958) +++ trunk/src/config/trunk/non-clustered/hornetq-configuration.xml 2010-03-24 16:08:44 UTC (rev 8959) @@ -2,6 +2,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> + <journal-min-files>10</journal-min-files> + <connectors> <connector name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> @@ -27,16 +29,16 @@ </security-setting> </security-settings> - <address-settings> - <!--default for catch all--> - <address-setting match="#"> - <dead-letter-address>jms.queue.DLQ</dead-letter-address> - <expiry-address>jms.queue.ExpiryQueue</expiry-address> - <redelivery-delay>0</redelivery-delay> - <max-size-bytes>-1</max-size-bytes> - <page-size-bytes>10485760</page-size-bytes> - <message-counter-history-day-limit>10</message-counter-history-day-limit> - </address-setting> - </address-settings> + <address-settings> + <!--default for catch all--> + <address-setting match="#"> + <dead-letter-address>jms.queue.DLQ</dead-letter-address> + <expiry-address>jms.queue.ExpiryQueue</expiry-address> + <redelivery-delay>0</redelivery-delay> + <max-size-bytes>10485760</max-size-bytes> + <message-counter-history-day-limit>10</message-counter-history-day-limit> + <address-full-policy>BLOCK</address-full-policy> + </address-setting> + </address-settings> </configuration>