Repository: activemq-artemis Updated Branches: refs/heads/master b76288987 -> 5f4b5eb40
ARTEMIS-873 update broker configs w/new notation Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d891fa5f Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d891fa5f Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d891fa5f Branch: refs/heads/master Commit: d891fa5f8351471be68ddd3b5ae80679ce2c4935 Parents: b762889 Author: Justin Bertram <[email protected]> Authored: Thu Jan 19 11:15:20 2017 -0600 Committer: Justin Bertram <[email protected]> Committed: Thu Jan 19 11:16:06 2017 -0600 ---------------------------------------------------------------------- .../org/apache/activemq/artemis/cli/commands/etc/broker.xml | 2 +- artemis-cli/src/test/resources/broker-nojms.xml | 2 +- artemis-cli/src/test/resources/broker-reload.xml | 2 +- artemis-cli/src/test/resources/broker.xml | 2 +- artemis-features/src/main/resources/artemis.xml | 2 +- .../paging/src/main/resources/activemq/server0/broker.xml | 8 ++++---- .../integration-tests/src/test/resources/reload-test-jms.xml | 2 +- .../src/test/resources/reload-test-updated-jms.xml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d891fa5f/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml index 51f10c5..f1f96e7 100644 --- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml +++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml @@ -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. 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> <!-- Acceptor for every supported protocol --> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d891fa5f/artemis-cli/src/test/resources/broker-nojms.xml ---------------------------------------------------------------------- diff --git a/artemis-cli/src/test/resources/broker-nojms.xml b/artemis-cli/src/test/resources/broker-nojms.xml index 11cb787..1ceecc9 100644 --- a/artemis-cli/src/test/resources/broker-nojms.xml +++ b/artemis-cli/src/test/resources/broker-nojms.xml @@ -64,7 +64,7 @@ under the License. <dead-letter-address>DLQ</dead-letter-address> <expiry-address>ExpiryQueue</expiry-address> <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> <address-full-policy>BLOCK</address-full-policy> </address-setting> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d891fa5f/artemis-cli/src/test/resources/broker-reload.xml ---------------------------------------------------------------------- diff --git a/artemis-cli/src/test/resources/broker-reload.xml b/artemis-cli/src/test/resources/broker-reload.xml index 93f909c..b89c705 100644 --- a/artemis-cli/src/test/resources/broker-reload.xml +++ b/artemis-cli/src/test/resources/broker-reload.xml @@ -67,7 +67,7 @@ under the License. <dead-letter-address>DLQ</dead-letter-address> <expiry-address>ExpiryQueue</expiry-address> <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> <address-full-policy>BLOCK</address-full-policy> </address-setting> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d891fa5f/artemis-cli/src/test/resources/broker.xml ---------------------------------------------------------------------- diff --git a/artemis-cli/src/test/resources/broker.xml b/artemis-cli/src/test/resources/broker.xml index d4e2400..70b659a 100644 --- a/artemis-cli/src/test/resources/broker.xml +++ b/artemis-cli/src/test/resources/broker.xml @@ -68,7 +68,7 @@ under the License. <dead-letter-address>DLQ</dead-letter-address> <expiry-address>ExpiryQueue</expiry-address> <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> <address-full-policy>BLOCK</address-full-policy> </address-setting> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d891fa5f/artemis-features/src/main/resources/artemis.xml ---------------------------------------------------------------------- diff --git a/artemis-features/src/main/resources/artemis.xml b/artemis-features/src/main/resources/artemis.xml index 7a51dc2..c54a289 100644 --- a/artemis-features/src/main/resources/artemis.xml +++ b/artemis-features/src/main/resources/artemis.xml @@ -54,7 +54,7 @@ under the License. <!-- 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 --> - <global-max-size>104857600</global-max-size> + <global-max-size>100Mb</global-max-size> <acceptors> <!-- Default ActiveMQ Artemis Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP. --> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d891fa5f/examples/features/standard/paging/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/paging/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/paging/src/main/resources/activemq/server0/broker.xml index fb260f6..11fb8a0 100644 --- a/examples/features/standard/paging/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/paging/src/main/resources/activemq/server0/broker.xml @@ -71,12 +71,12 @@ under the License. </address-setting> <address-setting match="exampleQueue"> - <max-size-bytes>10485760</max-size-bytes> - <page-size-bytes>1048576</page-size-bytes> + <max-size-bytes>10Mb</max-size-bytes> + <page-size-bytes>1Mb</page-size-bytes> </address-setting> <address-setting match="#"> - <max-size-bytes>10485760</max-size-bytes> - <page-size-bytes>1048576</page-size-bytes> + <max-size-bytes>10Mb</max-size-bytes> + <page-size-bytes>1Mb</page-size-bytes> </address-setting> </address-settings> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d891fa5f/tests/integration-tests/src/test/resources/reload-test-jms.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/reload-test-jms.xml b/tests/integration-tests/src/test/resources/reload-test-jms.xml index 5ff7184..ab1a8e5 100644 --- a/tests/integration-tests/src/test/resources/reload-test-jms.xml +++ b/tests/integration-tests/src/test/resources/reload-test-jms.xml @@ -103,7 +103,7 @@ under the License. <dead-letter-address>DLQ</dead-letter-address> <expiry-address>ExpiryQueue</expiry-address> <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> <address-full-policy>BLOCK</address-full-policy> </address-setting> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d891fa5f/tests/integration-tests/src/test/resources/reload-test-updated-jms.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/reload-test-updated-jms.xml b/tests/integration-tests/src/test/resources/reload-test-updated-jms.xml index 1a67013..0e3628d 100644 --- a/tests/integration-tests/src/test/resources/reload-test-updated-jms.xml +++ b/tests/integration-tests/src/test/resources/reload-test-updated-jms.xml @@ -113,7 +113,7 @@ under the License. <dead-letter-address>NewQueue</dead-letter-address> <expiry-address>NewQueue</expiry-address> <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> <address-full-policy>BLOCK</address-full-policy> </address-setting>
