Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-873 update broker configs w/new notation

This commit is contained in:
Justin Bertram 2017-01-19 11:15:20 -06:00
parent b762889874
commit d891fa5f83
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
View File

@ -58,7 +58,7 @@ ${ping-config.settings}${journal-buffer.settings}${connector-config.settings}
<!-- the system will enter into page mode once you hit this limit. <!-- the system will enter into page mode once you hit this limit.
This is an estimate in bytes of how much the messages are using in memory --> This is an estimate in bytes of how much the messages are using in memory -->
<global-max-size>104857600</global-max-size> <global-max-size>100Mb</global-max-size>
<acceptors> <acceptors>
<!-- Acceptor for every supported protocol --> <!-- Acceptor for every supported protocol -->

2
artemis-cli/src/test/resources/broker-nojms.xml
View File

@ -64,7 +64,7 @@ under the License.
<dead-letter-address>DLQ</dead-letter-address> <dead-letter-address>DLQ</dead-letter-address>
<expiry-address>ExpiryQueue</expiry-address> <expiry-address>ExpiryQueue</expiry-address>
<redelivery-delay>0</redelivery-delay> <redelivery-delay>0</redelivery-delay>
<max-size-bytes>10485760</max-size-bytes> <max-size-bytes>10Mb</max-size-bytes>
<message-counter-history-day-limit>10</message-counter-history-day-limit> <message-counter-history-day-limit>10</message-counter-history-day-limit>
<address-full-policy>BLOCK</address-full-policy> <address-full-policy>BLOCK</address-full-policy>
</address-setting> </address-setting>

2
artemis-cli/src/test/resources/broker-reload.xml
View File

@ -67,7 +67,7 @@ under the License.
<dead-letter-address>DLQ</dead-letter-address> <dead-letter-address>DLQ</dead-letter-address>
<expiry-address>ExpiryQueue</expiry-address> <expiry-address>ExpiryQueue</expiry-address>
<redelivery-delay>0</redelivery-delay> <redelivery-delay>0</redelivery-delay>
<max-size-bytes>10485760</max-size-bytes> <max-size-bytes>10Mb</max-size-bytes>
<message-counter-history-day-limit>10</message-counter-history-day-limit> <message-counter-history-day-limit>10</message-counter-history-day-limit>
<address-full-policy>BLOCK</address-full-policy> <address-full-policy>BLOCK</address-full-policy>
</address-setting> </address-setting>

2
artemis-cli/src/test/resources/broker.xml
View File

@ -68,7 +68,7 @@ under the License.
<dead-letter-address>DLQ</dead-letter-address> <dead-letter-address>DLQ</dead-letter-address>
<expiry-address>ExpiryQueue</expiry-address> <expiry-address>ExpiryQueue</expiry-address>
<redelivery-delay>0</redelivery-delay> <redelivery-delay>0</redelivery-delay>
<max-size-bytes>10485760</max-size-bytes> <max-size-bytes>10Mb</max-size-bytes>
<message-counter-history-day-limit>10</message-counter-history-day-limit> <message-counter-history-day-limit>10</message-counter-history-day-limit>
<address-full-policy>BLOCK</address-full-policy> <address-full-policy>BLOCK</address-full-policy>
</address-setting> </address-setting>

2
artemis-features/src/main/resources/artemis.xml
View File

@ -54,7 +54,7 @@ under the License.
<!-- the system will enter into page mode once you hit this limit. <!-- the system will enter into page mode once you hit this limit.
This is an estimate in bytes of how much the messages are using in memory --> This is an estimate in bytes of how much the messages are using in memory -->
<global-max-size>104857600</global-max-size> <global-max-size>100Mb</global-max-size>
<acceptors> <acceptors>
<!-- Default ActiveMQ Artemis Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP. --> <!-- Default ActiveMQ Artemis Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP. -->

8
examples/features/standard/paging/src/main/resources/activemq/server0/broker.xml
View File

@ -71,12 +71,12 @@ under the License.
</address-setting> </address-setting>
<address-setting match="exampleQueue"> <address-setting match="exampleQueue">
<max-size-bytes>10485760</max-size-bytes> <max-size-bytes>10Mb</max-size-bytes>
<page-size-bytes>1048576</page-size-bytes> <page-size-bytes>1Mb</page-size-bytes>
</address-setting> </address-setting>
<address-setting match="#"> <address-setting match="#">
<max-size-bytes>10485760</max-size-bytes> <max-size-bytes>10Mb</max-size-bytes>
<page-size-bytes>1048576</page-size-bytes> <page-size-bytes>1Mb</page-size-bytes>
</address-setting> </address-setting>
</address-settings> </address-settings>

2
tests/integration-tests/src/test/resources/reload-test-jms.xml
View File

@ -103,7 +103,7 @@ under the License.
<dead-letter-address>DLQ</dead-letter-address> <dead-letter-address>DLQ</dead-letter-address>
<expiry-address>ExpiryQueue</expiry-address> <expiry-address>ExpiryQueue</expiry-address>
<redelivery-delay>0</redelivery-delay> <redelivery-delay>0</redelivery-delay>
<max-size-bytes>10485760</max-size-bytes> <max-size-bytes>10Mb</max-size-bytes>
<message-counter-history-day-limit>10</message-counter-history-day-limit> <message-counter-history-day-limit>10</message-counter-history-day-limit>
<address-full-policy>BLOCK</address-full-policy> <address-full-policy>BLOCK</address-full-policy>
</address-setting> </address-setting>

2
tests/integration-tests/src/test/resources/reload-test-updated-jms.xml
View File

@ -113,7 +113,7 @@ under the License.
<dead-letter-address>NewQueue</dead-letter-address> <dead-letter-address>NewQueue</dead-letter-address>
<expiry-address>NewQueue</expiry-address> <expiry-address>NewQueue</expiry-address>
<redelivery-delay>0</redelivery-delay> <redelivery-delay>0</redelivery-delay>
<max-size-bytes>10485760</max-size-bytes> <max-size-bytes>10Mb</max-size-bytes>
<message-counter-history-day-limit>10</message-counter-history-day-limit> <message-counter-history-day-limit>10</message-counter-history-day-limit>
<address-full-policy>BLOCK</address-full-policy> <address-full-policy>BLOCK</address-full-policy>
</address-setting> </address-setting>