Skip to content

Commit

Permalink
ARTEMIS-3662 remove deprecated config from default broker.xml
Browse files Browse the repository at this point in the history 
The auto-create-jms-queues, auto-delete-jms-queues,
auto-create-jms-topics, and auto-delete-jms-topics address settings
were deprecated in ARTEMIS-881 way back in 2016. There's no need to keep
them in the default broker.xml at this point.
  • Loading branch information
@jbertram @clebertsuconic
jbertram authored and clebertsuconic committed Feb 4, 2022
1 parent d377a5a commit f18dd80
Show file tree
Hide file tree
Showing 67 changed files with 33 additions and 303 deletions.
4 changes: 0 additions & 4 deletions artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,6 @@ ${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-st
<address-full-policy>${full-policy}</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -141,8 +139,6 @@ ${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-st
<address-full-policy>${full-policy}</address-full-policy>
<auto-create-queues>${auto-create}</auto-create-queues>
<auto-create-addresses>${auto-create}</auto-create-addresses>
<auto-create-jms-queues>${auto-create}</auto-create-jms-queues>
<auto-create-jms-topics>${auto-create}</auto-create-jms-topics>
<auto-delete-queues>${auto-delete}</auto-delete-queues>
<auto-delete-addresses>${auto-delete}</auto-delete-addresses>
</address-setting>
Expand Down
4 changes: 0 additions & 4 deletions artemis-features/src/main/resources/artemis.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -175,8 +173,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions artemis-server/src/test/resources/ConfigurationTest-full-config-wrong-address.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -189,8 +187,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions ...s/features/broker-balancer/evenly-redirect/src/main/resources/activemq/server0/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -112,8 +110,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions ...s/features/broker-balancer/evenly-redirect/src/main/resources/activemq/server1/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -90,8 +88,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions ...s/features/broker-balancer/evenly-redirect/src/main/resources/activemq/server2/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -90,8 +88,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions ...eatures/broker-balancer/symmetric-redirect/src/main/resources/activemq/server0/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -127,8 +125,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions ...eatures/broker-balancer/symmetric-redirect/src/main/resources/activemq/server1/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -127,8 +125,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions .../features/broker-balancer/symmetric-simple/src/main/resources/activemq/server0/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -98,8 +96,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions .../features/broker-balancer/symmetric-simple/src/main/resources/activemq/server1/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -99,8 +97,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions .../broker-connection/amqp-receiving-messages/src/main/resources/activemq/server0/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -99,8 +97,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions .../broker-connection/amqp-receiving-messages/src/main/resources/activemq/server1/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -93,8 +91,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions ...connection/amqp-sending-messages-multicast/src/main/resources/activemq/server0/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -99,8 +97,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions ...connection/amqp-sending-messages-multicast/src/main/resources/activemq/server1/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -93,8 +91,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions ...es/broker-connection/amqp-sending-messages/src/main/resources/activemq/server0/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -99,8 +97,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions ...es/broker-connection/amqp-sending-messages/src/main/resources/activemq/server1/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -93,8 +91,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions ...s/features/standard/broker-msg-auth-plugin/src/main/resources/activemq/server0/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -179,8 +177,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions examples/features/standard/broker-plugin/src/main/resources/activemq/server0/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -176,8 +174,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
8 changes: 2 additions & 6 deletions tests/smoke-tests/src/main/resources/servers/MaxQueueResourceTest/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ under the License.
<journal-device-block-size>4096</journal-device-block-size>

<journal-file-size>10M</journal-file-size>

<!--
This value was determined through a calculation.
Your system could perform 25 writes per millisecond
Expand Down Expand Up @@ -118,7 +118,7 @@ under the License.

<critical-analyzer-policy>HALT</critical-analyzer-policy>


<page-sync-timeout>40000</page-sync-timeout>


Expand Down Expand Up @@ -180,8 +180,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -194,8 +192,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions tests/smoke-tests/src/main/resources/servers/audit-logging/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -162,8 +160,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down
4 changes: 0 additions & 4 deletions tests/smoke-tests/src/main/resources/servers/audit-logging2/broker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
<!--default for catch all-->
<address-setting match="#">
Expand All @@ -162,8 +160,6 @@ under the License.
<address-full-policy>PAGE</address-full-policy>
<auto-create-queues>true</auto-create-queues>
<auto-create-addresses>true</auto-create-addresses>
<auto-create-jms-queues>true</auto-create-jms-queues>
<auto-create-jms-topics>true</auto-create-jms-topics>
</address-setting>
</address-settings>

Expand Down

0 comments on commit f18dd80

Please sign in to comment.