renamed config to broker.xml
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ac5bb8fd Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ac5bb8fd Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ac5bb8fd Branch: refs/heads/master Commit: ac5bb8fd6cd6f942653392586aaf9aa54b92b5d7 Parents: 4823b3e Author: Andy Taylor <[email protected]> Authored: Wed Apr 29 10:30:31 2015 +0100 Committer: Andy Taylor <[email protected]> Committed: Wed Apr 29 10:30:32 2015 +0100 ---------------------------------------------------------------------- .../activemq/artemis/cli/commands/Create.java | 2 +- .../cli/commands/bin/activemq-service.xml | 2 +- .../cli/commands/etc/activemq-configuration.xml | 81 ------------ .../artemis/cli/commands/etc/activemq.profile | 2 +- .../cli/commands/etc/activemq.profile.cmd | 2 +- .../artemis/cli/commands/etc/bootstrap.xml | 2 +- .../artemis/cli/commands/etc/broker.xml | 81 ++++++++++++ .../activemq/artemis/test/FileBrokerTest.java | 2 +- .../test/resources/activemq-configuration.xml | 77 ----------- artemis-bootstrap/src/test/resources/broker.xml | 77 +++++++++++ .../activemq/artemis/api/core/Interceptor.java | 2 +- .../core/impl/ActiveMQSessionContext.java | 2 +- .../artemis/server/ActiveMQBootstrap.java | 2 +- .../protocol/stomp/StompFrameInterceptor.java | 2 +- .../test/resources/activemq-configuration.xml | 53 -------- artemis-rest/src/test/resources/broker.xml | 53 ++++++++ .../core/config/FileDeploymentManager.java | 2 +- .../artemis/core/deployers/Deployable.java | 2 +- .../core/server/embedded/EmbeddedActiveMQ.java | 4 +- docs/user-manual/en/clusters.md | 16 +-- docs/user-manual/en/configuration-index.md | 2 +- docs/user-manual/en/configuring-transports.md | 4 +- docs/user-manual/en/connection-ttl.md | 2 +- docs/user-manual/en/core-bridges.md | 8 +- docs/user-manual/en/diverts.md | 2 +- docs/user-manual/en/duplicate-detection.md | 8 +- docs/user-manual/en/embedding-activemq.md | 4 +- docs/user-manual/en/filter-expressions.md | 2 +- docs/user-manual/en/ha.md | 14 +- docs/user-manual/en/intercepting-operations.md | 2 +- docs/user-manual/en/management.md | 14 +- docs/user-manual/en/message-expiry.md | 2 +- docs/user-manual/en/message-grouping.md | 2 +- docs/user-manual/en/paging.md | 4 +- docs/user-manual/en/perf-tuning.md | 10 +- docs/user-manual/en/persistence.md | 6 +- docs/user-manual/en/queue-attributes.md | 6 +- docs/user-manual/en/rest.md | 2 +- docs/user-manual/en/security.md | 4 +- docs/user-manual/en/send-guarantees.md | 2 +- docs/user-manual/en/spring-integration.md | 2 +- docs/user-manual/en/thread-pooling.md | 4 +- docs/user-manual/en/transaction-config.md | 2 +- docs/user-manual/en/undelivered-messages.md | 2 +- docs/user-manual/en/using-server.md | 6 +- docs/user-manual/en/wildcard-routing.md | 2 +- .../server0/activemq-configuration.xml | 67 ---------- .../perf/src/main/resources/server0/broker.xml | 67 ++++++++++ .../server0/activemq-configuration.xml | 81 ------------ .../src/main/resources/server0/broker.xml | 81 ++++++++++++ examples/jms/aerogear/readme.html | 2 +- .../activemq/server0/activemq-configuration.xml | 78 ----------- .../main/resources/activemq/server0/broker.xml | 78 +++++++++++ .../activemq/server0/activemq-configuration.xml | 53 -------- .../main/resources/activemq/server0/broker.xml | 53 ++++++++ .../activemq/server1/activemq-configuration.xml | 56 -------- .../main/resources/activemq/server1/broker.xml | 56 ++++++++ examples/jms/bridge/readme.html | 2 +- .../activemq/server0/activemq-configuration.xml | 88 ------------- .../main/resources/activemq/server0/broker.xml | 88 +++++++++++++ .../activemq/server1/activemq-configuration.xml | 59 --------- .../main/resources/activemq/server1/broker.xml | 59 +++++++++ .../activemq/server0/activemq-configuration.xml | 61 --------- .../main/resources/activemq/server0/broker.xml | 61 +++++++++ .../activemq/server0/activemq-configuration.xml | 47 ------- .../main/resources/activemq/server0/broker.xml | 47 +++++++ .../activemq/server0/activemq-configuration.xml | 92 ------------- .../main/resources/activemq/server0/broker.xml | 92 +++++++++++++ .../activemq/server1/activemq-configuration.xml | 93 -------------- .../main/resources/activemq/server1/broker.xml | 93 ++++++++++++++ .../jms/client-side-load-balancing/readme.html | 2 +- .../activemq/server0/activemq-configuration.xml | 92 ------------- .../main/resources/activemq/server0/broker.xml | 92 +++++++++++++ .../activemq/server1/activemq-configuration.xml | 89 ------------- .../main/resources/activemq/server1/broker.xml | 89 +++++++++++++ .../activemq/server2/activemq-configuration.xml | 87 ------------- .../main/resources/activemq/server2/broker.xml | 87 +++++++++++++ .../activemq/server0/activemq-configuration.xml | 96 -------------- .../main/resources/activemq/server0/broker.xml | 96 ++++++++++++++ .../activemq/server1/activemq-configuration.xml | 97 -------------- .../main/resources/activemq/server1/broker.xml | 97 ++++++++++++++ .../activemq/server0/activemq-configuration.xml | 105 --------------- .../main/resources/activemq/server0/broker.xml | 105 +++++++++++++++ .../activemq/server1/activemq-configuration.xml | 102 --------------- .../main/resources/activemq/server1/broker.xml | 102 +++++++++++++++ .../activemq/server2/activemq-configuration.xml | 102 --------------- .../main/resources/activemq/server2/broker.xml | 102 +++++++++++++++ .../activemq/server0/activemq-configuration.xml | 98 -------------- .../main/resources/activemq/server0/broker.xml | 98 ++++++++++++++ .../activemq/server1/activemq-configuration.xml | 97 -------------- .../main/resources/activemq/server1/broker.xml | 97 ++++++++++++++ .../activemq/server0/activemq-configuration.xml | 96 -------------- .../main/resources/activemq/server0/broker.xml | 96 ++++++++++++++ .../activemq/server1/activemq-configuration.xml | 96 -------------- .../main/resources/activemq/server1/broker.xml | 96 ++++++++++++++ .../activemq/server0/activemq-configuration.xml | 96 -------------- .../main/resources/activemq/server0/broker.xml | 96 ++++++++++++++ .../activemq/server1/activemq-configuration.xml | 96 -------------- .../main/resources/activemq/server1/broker.xml | 96 ++++++++++++++ .../activemq/server2/activemq-configuration.xml | 96 -------------- .../main/resources/activemq/server2/broker.xml | 96 ++++++++++++++ .../activemq/server0/activemq-configuration.xml | 83 ------------ .../main/resources/activemq/server0/broker.xml | 83 ++++++++++++ .../activemq/server1/activemq-configuration.xml | 83 ------------ .../main/resources/activemq/server1/broker.xml | 83 ++++++++++++ .../activemq/server2/activemq-configuration.xml | 80 ------------ .../main/resources/activemq/server2/broker.xml | 80 ++++++++++++ .../activemq/server3/activemq-configuration.xml | 80 ------------ .../main/resources/activemq/server3/broker.xml | 80 ++++++++++++ .../activemq/server0/activemq-configuration.xml | 80 ------------ .../main/resources/activemq/server0/broker.xml | 80 ++++++++++++ .../activemq/server1/activemq-configuration.xml | 80 ------------ .../main/resources/activemq/server1/broker.xml | 80 ++++++++++++ .../activemq/server2/activemq-configuration.xml | 75 ----------- .../main/resources/activemq/server2/broker.xml | 75 +++++++++++ .../activemq/server0/activemq-configuration.xml | 98 -------------- .../main/resources/activemq/server0/broker.xml | 98 ++++++++++++++ .../activemq/server1/activemq-configuration.xml | 96 -------------- .../main/resources/activemq/server1/broker.xml | 96 ++++++++++++++ .../activemq/server0/activemq-configuration.xml | 128 ------------------- .../main/resources/activemq/server0/broker.xml | 128 +++++++++++++++++++ .../activemq/server1/activemq-configuration.xml | 128 ------------------- .../main/resources/activemq/server1/broker.xml | 128 +++++++++++++++++++ .../activemq/server0/activemq-configuration.xml | 112 ---------------- .../main/resources/activemq/server0/broker.xml | 112 ++++++++++++++++ .../activemq/server1/activemq-configuration.xml | 111 ---------------- .../main/resources/activemq/server1/broker.xml | 111 ++++++++++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ examples/jms/dead-letter/readme.html | 2 +- .../activemq/server0/activemq-configuration.xml | 71 ---------- .../main/resources/activemq/server0/broker.xml | 71 ++++++++++ examples/jms/delayed-redelivery/readme.html | 2 +- .../activemq/server0/activemq-configuration.xml | 70 ---------- .../main/resources/activemq/server0/broker.xml | 70 ++++++++++ examples/jms/divert/readme.html | 2 +- .../activemq/server0/activemq-configuration.xml | 124 ------------------ .../main/resources/activemq/server0/broker.xml | 124 ++++++++++++++++++ .../activemq/server1/activemq-configuration.xml | 64 ---------- .../main/resources/activemq/server1/broker.xml | 64 ++++++++++ .../activemq/server0/activemq-configuration.xml | 61 --------- .../main/resources/activemq/server0/broker.xml | 61 +++++++++ examples/jms/embedded-simple/readme.html | 2 +- .../main/resources/activemq-configuration.xml | 52 -------- .../src/main/resources/broker.xml | 52 ++++++++ examples/jms/expiry/readme.html | 2 +- .../activemq/server0/activemq-configuration.xml | 70 ---------- .../main/resources/activemq/server0/broker.xml | 70 ++++++++++ .../activemq/server0/activemq-configuration.xml | 108 ---------------- .../main/resources/activemq/server0/broker.xml | 108 ++++++++++++++++ .../activemq/server1/activemq-configuration.xml | 108 ---------------- .../main/resources/activemq/server1/broker.xml | 108 ++++++++++++++++ examples/jms/http-transport/readme.html | 2 +- .../activemq/server0/activemq-configuration.xml | 61 --------- .../main/resources/activemq/server0/broker.xml | 61 +++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ examples/jms/interceptor/readme.html | 2 +- .../activemq/server0/activemq-configuration.xml | 65 ---------- .../main/resources/activemq/server0/broker.xml | 65 ++++++++++ .../activemq/server0/activemq-configuration.xml | 59 --------- .../main/resources/activemq/server0/broker.xml | 59 +++++++++ .../activemq/server0/activemq-configuration.xml | 53 -------- .../main/resources/activemq/server0/broker.xml | 53 ++++++++ .../activemq/server1/activemq-configuration.xml | 53 -------- .../main/resources/activemq/server1/broker.xml | 53 ++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ .../activemq/server0/activemq-configuration.xml | 64 ---------- .../main/resources/activemq/server0/broker.xml | 64 ++++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ examples/jms/last-value-queue/readme.html | 2 +- .../activemq/server0/activemq-configuration.xml | 67 ---------- .../main/resources/activemq/server0/broker.xml | 67 ++++++++++ .../jms/management-notifications/readme.html | 4 +- .../activemq/server0/activemq-configuration.xml | 81 ------------ .../main/resources/activemq/server0/broker.xml | 81 ++++++++++++ examples/jms/management/readme.html | 4 +- .../activemq/server0/activemq-configuration.xml | 76 ----------- .../main/resources/activemq/server0/broker.xml | 76 +++++++++++ examples/jms/message-counters/readme.html | 2 +- .../activemq/server0/activemq-configuration.xml | 86 ------------- .../main/resources/activemq/server0/broker.xml | 86 +++++++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ .../activemq/server0/activemq-configuration.xml | 93 -------------- .../main/resources/activemq/server0/broker.xml | 93 ++++++++++++++ .../activemq/server1/activemq-configuration.xml | 93 -------------- .../main/resources/activemq/server1/broker.xml | 93 ++++++++++++++ .../activemq/server2/activemq-configuration.xml | 94 -------------- .../main/resources/activemq/server2/broker.xml | 94 ++++++++++++++ .../activemq/server0/activemq-configuration.xml | 95 -------------- .../main/resources/activemq/server0/broker.xml | 95 ++++++++++++++ .../activemq/server1/activemq-configuration.xml | 93 -------------- .../main/resources/activemq/server1/broker.xml | 93 ++++++++++++++ .../activemq/server2/activemq-configuration.xml | 93 -------------- .../main/resources/activemq/server2/broker.xml | 93 ++++++++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ .../activemq/server0/activemq-configuration.xml | 93 -------------- .../main/resources/activemq/server0/broker.xml | 93 ++++++++++++++ .../activemq/server1/activemq-configuration.xml | 94 -------------- .../main/resources/activemq/server1/broker.xml | 94 ++++++++++++++ .../activemq/server0/activemq-configuration.xml | 69 ---------- .../main/resources/activemq/server0/broker.xml | 69 ++++++++++ examples/jms/paging/readme.html | 2 +- .../activemq/server0/activemq-configuration.xml | 93 -------------- .../main/resources/activemq/server0/broker.xml | 93 ++++++++++++++ .../activemq/server0/activemq-configuration.xml | 46 ------- .../main/resources/activemq/server0/broker.xml | 46 +++++++ .../activemq/server0/activemq-configuration.xml | 63 --------- .../main/resources/activemq/server0/broker.xml | 63 +++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ .../activemq/server0/activemq-configuration.xml | 61 --------- .../main/resources/activemq/server0/broker.xml | 61 +++++++++ .../activemq/server0/activemq-configuration.xml | 67 ---------- .../main/resources/activemq/server0/broker.xml | 67 ++++++++++ .../activemq/server0/activemq-configuration.xml | 65 ---------- .../main/resources/activemq/server0/broker.xml | 65 ++++++++++ .../queue-message-redistribution/readme.html | 2 +- .../activemq/server0/activemq-configuration.xml | 107 ---------------- .../main/resources/activemq/server0/broker.xml | 107 ++++++++++++++++ .../activemq/server1/activemq-configuration.xml | 108 ---------------- .../main/resources/activemq/server1/broker.xml | 108 ++++++++++++++++ .../activemq/server0/activemq-configuration.xml | 67 ---------- .../main/resources/activemq/server0/broker.xml | 67 ++++++++++ .../activemq/server0/activemq-configuration.xml | 59 --------- .../main/resources/activemq/server0/broker.xml | 59 +++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ .../activemq/server0/activemq-configuration.xml | 82 ------------ .../main/resources/activemq/server0/broker.xml | 82 ++++++++++++ .../activemq/server0/activemq-configuration.xml | 87 ------------- .../main/resources/activemq/server0/broker.xml | 87 +++++++++++++ .../activemq/server1/activemq-configuration.xml | 89 ------------- .../main/resources/activemq/server1/broker.xml | 89 +++++++++++++ .../activemq/server0/activemq-configuration.xml | 101 --------------- .../main/resources/activemq/server0/broker.xml | 101 +++++++++++++++ .../activemq/server1/activemq-configuration.xml | 102 --------------- .../main/resources/activemq/server1/broker.xml | 102 +++++++++++++++ .../activemq/server0/activemq-configuration.xml | 95 -------------- .../main/resources/activemq/server0/broker.xml | 95 ++++++++++++++ .../activemq/server1/activemq-configuration.xml | 95 -------------- .../main/resources/activemq/server1/broker.xml | 95 ++++++++++++++ .../activemq/server2/activemq-configuration.xml | 94 -------------- .../main/resources/activemq/server2/broker.xml | 94 ++++++++++++++ .../activemq/server0/activemq-configuration.xml | 96 -------------- .../main/resources/activemq/server0/broker.xml | 96 ++++++++++++++ .../activemq/server1/activemq-configuration.xml | 97 -------------- .../main/resources/activemq/server1/broker.xml | 97 ++++++++++++++ .../activemq/server0/activemq-configuration.xml | 67 ---------- .../main/resources/activemq/server0/broker.xml | 67 ++++++++++ .../main/resources/activemq-configuration.xml | 59 --------- .../rest/dup-send/src/main/resources/broker.xml | 59 +++++++++ .../main/resources/activemq-configuration.xml | 58 --------- .../src/main/resources/broker.xml | 58 +++++++++ .../main/resources/activemq-configuration.xml | 59 --------- .../jms-to-rest/src/main/resources/broker.xml | 59 +++++++++ .../main/resources/activemq-configuration.xml | 60 --------- .../jms/rest/push/src/main/resources/broker.xml | 60 +++++++++ .../activemq/server0/activemq-configuration.xml | 118 ----------------- .../main/resources/activemq/server0/broker.xml | 118 +++++++++++++++++ .../activemq/server1/activemq-configuration.xml | 109 ---------------- .../main/resources/activemq/server1/broker.xml | 109 ++++++++++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ examples/jms/security/readme.html | 2 +- .../activemq/server0/activemq-configuration.xml | 81 ------------ .../main/resources/activemq/server0/broker.xml | 81 ++++++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ .../main/resources/activemq-configuration.xml | 53 -------- .../src/main/resources/broker.xml | 53 ++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ .../activemq/server0/activemq-configuration.xml | 62 --------- .../main/resources/activemq/server0/broker.xml | 62 +++++++++ examples/jms/static-selector/readme.html | 2 +- .../activemq/server0/activemq-configuration.xml | 67 ---------- .../main/resources/activemq/server0/broker.xml | 67 ++++++++++ .../activemq/server0/activemq-configuration.xml | 64 ---------- .../main/resources/activemq/server0/broker.xml | 64 ++++++++++ .../activemq/server0/activemq-configuration.xml | 64 ---------- .../main/resources/activemq/server0/broker.xml | 64 ++++++++++ .../activemq/server0/activemq-configuration.xml | 64 ---------- .../main/resources/activemq/server0/broker.xml | 64 ++++++++++ .../activemq/server0/activemq-configuration.xml | 64 ---------- .../main/resources/activemq/server0/broker.xml | 64 ++++++++++ .../activemq/server0/activemq-configuration.xml | 94 -------------- .../main/resources/activemq/server0/broker.xml | 94 ++++++++++++++ .../activemq/server1/activemq-configuration.xml | 94 -------------- .../main/resources/activemq/server1/broker.xml | 94 ++++++++++++++ examples/jms/symmetric-cluster/readme.html | 2 +- .../activemq/server0/activemq-configuration.xml | 100 --------------- .../main/resources/activemq/server0/broker.xml | 100 +++++++++++++++ .../activemq/server1/activemq-configuration.xml | 98 -------------- .../main/resources/activemq/server1/broker.xml | 98 ++++++++++++++ .../activemq/server2/activemq-configuration.xml | 98 -------------- .../main/resources/activemq/server2/broker.xml | 98 ++++++++++++++ .../activemq/server3/activemq-configuration.xml | 98 -------------- .../main/resources/activemq/server3/broker.xml | 98 ++++++++++++++ .../activemq/server4/activemq-configuration.xml | 97 -------------- .../main/resources/activemq/server4/broker.xml | 97 ++++++++++++++ .../activemq/server5/activemq-configuration.xml | 97 -------------- .../main/resources/activemq/server5/broker.xml | 97 ++++++++++++++ .../activemq/server0/activemq-configuration.xml | 74 ----------- .../main/resources/activemq/server0/broker.xml | 74 +++++++++++ .../activemq/server0/activemq-configuration.xml | 71 ---------- .../main/resources/activemq/server0/broker.xml | 71 ++++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ .../activemq/server0/activemq-configuration.xml | 96 -------------- .../main/resources/activemq/server0/broker.xml | 96 ++++++++++++++ .../activemq/server1/activemq-configuration.xml | 96 -------------- .../main/resources/activemq/server1/broker.xml | 96 ++++++++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ .../activemq/server0/activemq-configuration.xml | 60 --------- .../main/resources/activemq/server0/broker.xml | 60 +++++++++ examples/soak/normal/README | 4 +- .../normal/server0/activemq-configuration.xml | 50 -------- examples/soak/normal/server0/broker.xml | 50 ++++++++ .../test/resources/activemq-configuration.xml | 56 -------- tests/jms-tests/src/test/resources/broker.xml | 56 ++++++++ 342 files changed, 11241 insertions(+), 11241 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java ---------------------------------------------------------------------- diff --git a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java index 7618de5..22cc10e 100644 --- a/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java +++ b/artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java @@ -159,7 +159,7 @@ public class Create implements Action write("etc/logging.properties", null, false); write("etc/bootstrap.xml", null, false); - write("etc/activemq-configuration.xml", filters, false); + write("etc/broker.xml", filters, false); write("etc/activemq-roles.properties", null, false); write("etc/activemq-users.properties", null, false); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml ---------------------------------------------------------------------- diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml index 1a95c68..12dc6ce 100644 --- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml +++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml @@ -32,7 +32,7 @@ <argument>-Xms512M</argument> <argument>-Xmx1024M</argument> - <!-- Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in activemq-configuration.xml + <!-- Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml <argument>-Dactivemq.remoting.default.port=61617</argument> <argument>-Dactivemq.remoting.amqp.port=5673</argument> <argument>-Dactivemq.remoting.stomp.port=61614</argument> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq-configuration.xml b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq-configuration.xml deleted file mode 100644 index 9f9489a..0000000 --- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq-configuration.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - <jms xmlns="urn:activemq:jms"> - <queue name="DLQ"/> - <queue name="ExpiryQueue"/> - </jms> - <core xmlns="urn:activemq:core"> - <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> - <!-- Default Connector. Returned to clients during broadcast and distributed around cluster. See broadcast and discovery-groups --> - <connector name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</connector> - </connectors> - - <acceptors> - <!-- Default ActiveMQ Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP. --> - <acceptor name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</acceptor> - - <!-- AMQP Acceptor. Listens on default AMQP port for AMQP traffic.--> - <acceptor name="amqp">tcp://${activemq.remoting.amqp.host:localhost}:${activemq.remoting.amqp.port:5672}?protocols=AMQP</acceptor> - - <!-- STOMP Acceptor. --> - <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:localhost}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor> - - <!-- HornetQ Compatibility Acceptor. Enables ActiveMQ Core and STOMP for legacy HornetQ clients. --> - <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:localhost}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor> - </acceptors> - - ${cluster.settings}${replicated.settings}${shared-store.settings} - - <security-settings> - <security-setting match="#"> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - </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>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> - </core> -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile ---------------------------------------------------------------------- diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile index 652ad11..755fec1 100644 --- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile +++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile @@ -17,7 +17,7 @@ ACTIVEMQ_HOME='${activemq.home}' -# Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in activemq-configuration.xml +# Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml #ACTIVEMQ_CLUSTER_PROPS="-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446" # Java Opts http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile.cmd ---------------------------------------------------------------------- diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile.cmd b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile.cmd index 77800c8..3c28564 100644 --- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile.cmd +++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile.cmd @@ -17,7 +17,7 @@ rem under the License. set ACTIVEMQ_HOME=${activemq.home} -rem Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in activemq-configuration.xml +rem Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml rem set ACTIVEMQ_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446 rem Java Opts http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml ---------------------------------------------------------------------- diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml index 1025f05..530db62 100644 --- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml +++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml @@ -24,7 +24,7 @@ default-user="guest" /> - <server configuration="file:${activemq.instance}/etc/activemq-configuration.xml"/> + <server configuration="file:${activemq.instance}/etc/broker.xml"/> <web bind="http://localhost:8161"; path="web"> <app url="jolokia" war="jolokia-war-1.2.3.war"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml ---------------------------------------------------------------------- diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml new file mode 100644 index 0000000..9f9489a --- /dev/null +++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml @@ -0,0 +1,81 @@ +<?xml version='1.0'?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> + <jms xmlns="urn:activemq:jms"> + <queue name="DLQ"/> + <queue name="ExpiryQueue"/> + </jms> + <core xmlns="urn:activemq:core"> + <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> + <!-- Default Connector. Returned to clients during broadcast and distributed around cluster. See broadcast and discovery-groups --> + <connector name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</connector> + </connectors> + + <acceptors> + <!-- Default ActiveMQ Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP. --> + <acceptor name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</acceptor> + + <!-- AMQP Acceptor. Listens on default AMQP port for AMQP traffic.--> + <acceptor name="amqp">tcp://${activemq.remoting.amqp.host:localhost}:${activemq.remoting.amqp.port:5672}?protocols=AMQP</acceptor> + + <!-- STOMP Acceptor. --> + <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:localhost}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor> + + <!-- HornetQ Compatibility Acceptor. Enables ActiveMQ Core and STOMP for legacy HornetQ clients. --> + <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:localhost}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor> + </acceptors> + + ${cluster.settings}${replicated.settings}${shared-store.settings} + + <security-settings> + <security-setting match="#"> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" roles="guest"/> + <permission type="consume" roles="guest"/> + <permission type="send" roles="guest"/> + </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>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> + </core> +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java ---------------------------------------------------------------------- diff --git a/artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java b/artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java index a177d65..89eccef 100644 --- a/artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java +++ b/artemis-bootstrap/src/test/java/org/apache/activemq/artemis/test/FileBrokerTest.java @@ -30,7 +30,7 @@ public class FileBrokerTest public void startWithJMS() throws Exception { ServerDTO serverDTO = new ServerDTO(); - serverDTO.configuration = "activemq-configuration.xml"; + serverDTO.configuration = "broker.xml"; FileBroker broker = null; try { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-bootstrap/src/test/resources/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/artemis-bootstrap/src/test/resources/activemq-configuration.xml b/artemis-bootstrap/src/test/resources/activemq-configuration.xml deleted file mode 100644 index 219c0b2..0000000 --- a/artemis-bootstrap/src/test/resources/activemq-configuration.xml +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<configuration xmlns="urn:activemq"> - <jms xmlns="urn:activemq:jms"> - <queue name="DLQ"/> - <queue name="ExpiryQueue"/> - </jms> - <core xmlns="urn:activemq:core"> - <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> - <!-- Default Connector. Returned to clients during broadcast and distributed around cluster. See broadcast and discovery-groups --> - <connector name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</connector> - </connectors> - - <acceptors> - <!-- Default ActiveMQ Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP. --> - <acceptor name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</acceptor> - - <!-- AMQP Acceptor. Listens on default AMQP port for AMQP traffic.--> - <acceptor name="amqp">tcp://${activemq.remoting.amqp.host:localhost}:${activemq.remoting.amqp.port:5672}?protocols=AMQP</acceptor> - - <!-- STOMP Acceptor. --> - <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:localhost}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor> - - <!-- HornetQ Compatibility Acceptor. Enables ActiveMQ Core and STOMP for legacy HornetQ clients. --> - <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:localhost}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor> - </acceptors> - - <security-settings> - <security-setting match="#"> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - </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>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> - </core> -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-bootstrap/src/test/resources/broker.xml ---------------------------------------------------------------------- diff --git a/artemis-bootstrap/src/test/resources/broker.xml b/artemis-bootstrap/src/test/resources/broker.xml new file mode 100644 index 0000000..219c0b2 --- /dev/null +++ b/artemis-bootstrap/src/test/resources/broker.xml @@ -0,0 +1,77 @@ +<?xml version='1.0'?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<configuration xmlns="urn:activemq"> + <jms xmlns="urn:activemq:jms"> + <queue name="DLQ"/> + <queue name="ExpiryQueue"/> + </jms> + <core xmlns="urn:activemq:core"> + <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> + <!-- Default Connector. Returned to clients during broadcast and distributed around cluster. See broadcast and discovery-groups --> + <connector name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</connector> + </connectors> + + <acceptors> + <!-- Default ActiveMQ Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP. --> + <acceptor name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</acceptor> + + <!-- AMQP Acceptor. Listens on default AMQP port for AMQP traffic.--> + <acceptor name="amqp">tcp://${activemq.remoting.amqp.host:localhost}:${activemq.remoting.amqp.port:5672}?protocols=AMQP</acceptor> + + <!-- STOMP Acceptor. --> + <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:localhost}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor> + + <!-- HornetQ Compatibility Acceptor. Enables ActiveMQ Core and STOMP for legacy HornetQ clients. --> + <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:localhost}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor> + </acceptors> + + <security-settings> + <security-setting match="#"> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" roles="guest"/> + <permission type="consume" roles="guest"/> + <permission type="send" roles="guest"/> + </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>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> + </core> +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java index adea81b..2e1a9a3 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java @@ -22,7 +22,7 @@ import org.apache.activemq.artemis.core.protocol.core.Packet; * This is class is a simple way to intercepting calls on ActiveMQ client and servers. * <p> * To add an interceptor to ActiveMQ server, you have to modify the server configuration file - * {@literal activemq-configuration.xml}.<br> + * {@literal broker.xml}.<br> * To add it to a client, use {@link org.apache.activemq.artemis.api.core.client.ServerLocator#addIncomingInterceptor(Interceptor)} */ public interface Interceptor extends BaseInterceptor<Packet> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java index 42a3e84..aad2ec6 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java @@ -677,7 +677,7 @@ public class ActiveMQSessionContext extends SessionContext ClientSession.QueueQuery queueInfo = consumerInternal.getQueueInfo(); // We try and recreate any non durable queues, since they probably won't be there unless - // they are defined in activemq-configuration.xml + // they are defined in broker.xml // This allows e.g. JMS non durable subs and temporary queues to continue to be used after failover if (!queueInfo.isDurable()) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java ---------------------------------------------------------------------- diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java index c872f51..c250966 100644 --- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java @@ -96,7 +96,7 @@ public class ActiveMQBootstrap { //extendPluginClasspath(configurationDir); configuration = new FileConfiguration(); - File file = new File(new File(configurationDir), "activemq-configuration.xml"); + File file = new File(new File(configurationDir), "broker.xml"); jmsFileConfiguration = new FileJMSConfiguration(); FileDeploymentManager deploymentManager = new FileDeploymentManager(file.toURI().toString()); deploymentManager.addDeployable((FileConfiguration)configuration); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java ---------------------------------------------------------------------- diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java index a807aee..ee8755f 100644 --- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java @@ -22,7 +22,7 @@ import org.apache.activemq.artemis.api.core.BaseInterceptor; * This class is a simple way to intercepting client calls on ActiveMQ using STOMP protocol. * <p> * To add an interceptor to ActiveMQ server, you have to modify the server configuration file - * {@literal activemq-configuration.xml}.<br> + * {@literal broker.xml}.<br> */ public interface StompFrameInterceptor extends BaseInterceptor<StompFrame> { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-rest/src/test/resources/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/artemis-rest/src/test/resources/activemq-configuration.xml b/artemis-rest/src/test/resources/activemq-configuration.xml deleted file mode 100644 index 5986c24..0000000 --- a/artemis-rest/src/test/resources/activemq-configuration.xml +++ /dev/null @@ -1,53 +0,0 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="exampleQueue"/> - </jms> - - <core xmlns="urn:activemq:core"> - - <persistence-enabled>false</persistence-enabled> - <!-- Connectors --> - - <connectors> - <connector name="in-vm">vm://0</connector> - </connectors> - - <acceptors> - <acceptor name="in-vm">vm://0</acceptor> - </acceptors> - - <!-- Other config --> - - <security-settings> - <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - </security-setting> - </security-settings> - </core> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-rest/src/test/resources/broker.xml ---------------------------------------------------------------------- diff --git a/artemis-rest/src/test/resources/broker.xml b/artemis-rest/src/test/resources/broker.xml new file mode 100644 index 0000000..5986c24 --- /dev/null +++ b/artemis-rest/src/test/resources/broker.xml @@ -0,0 +1,53 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + <jms xmlns="urn:activemq:jms"> + <!--the queue used by the example--> + <queue name="exampleQueue"/> + </jms> + + <core xmlns="urn:activemq:core"> + + <persistence-enabled>false</persistence-enabled> + <!-- Connectors --> + + <connectors> + <connector name="in-vm">vm://0</connector> + </connectors> + + <acceptors> + <acceptor name="in-vm">vm://0</acceptor> + </acceptors> + + <!-- Other config --> + + <security-settings> + <!--security for example queue--> + <security-setting match="jms.queue.exampleQueue"> + <permission type="createDurableQueue" roles="guest"/> + <permission type="deleteDurableQueue" roles="guest"/> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" roles="guest"/> + <permission type="consume" roles="guest"/> + <permission type="send" roles="guest"/> + </security-setting> + </security-settings> + </core> + +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/FileDeploymentManager.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/FileDeploymentManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/FileDeploymentManager.java index 77fa4fe..2c9b06f 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/FileDeploymentManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/FileDeploymentManager.java @@ -37,7 +37,7 @@ import org.w3c.dom.NodeList; */ public class FileDeploymentManager { - private static final String DEFAULT_CONFIGURATION_URL = "activemq-configuration.xml"; + private static final String DEFAULT_CONFIGURATION_URL = "broker.xml"; private final String configurationUrl; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/Deployable.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/Deployable.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/Deployable.java index 96ab876..ebd945b 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/Deployable.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/Deployable.java @@ -24,7 +24,7 @@ import javax.management.MBeanServer; import java.util.Map; /** - * A Deployable is an object that can be configured via an xml configuration element in the main configuration file "activemq-configuration.xml" + * A Deployable is an object that can be configured via an xml configuration element in the main configuration file "broker.xml" * It holds all the information needed by the FileDeploymentManager to parse the configuration and build the component */ public interface Deployable http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java index 8e618a3..c2b22b0 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java @@ -38,7 +38,7 @@ public class EmbeddedActiveMQ protected MBeanServer mbeanServer; /** - * Classpath resource for activemq server config. Defaults to 'activemq-configuration.xml'. + * Classpath resource for activemq server config. Defaults to 'broker.xml'. * * @param filename */ @@ -94,7 +94,7 @@ public class EmbeddedActiveMQ { if (configuration == null) { - if (configResourcePath == null) configResourcePath = "activemq-configuration.xml"; + if (configResourcePath == null) configResourcePath = "broker.xml"; FileDeploymentManager deploymentManager = new FileDeploymentManager(configResourcePath); FileConfiguration config = new FileConfiguration(); deploymentManager.addDeployable(config); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/clusters.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/clusters.md b/docs/user-manual/en/clusters.md index d9a128c..747632a 100644 --- a/docs/user-manual/en/clusters.md +++ b/docs/user-manual/en/clusters.md @@ -8,7 +8,7 @@ the cluster is an active Apache ActiveMQ Artemis server which manages its own me and handles its own connections. The cluster is formed by each node declaring *cluster connections* to -other nodes in the core configuration file `activemq-configuration.xml`. +other nodes in the core configuration file `broker.xml`. When a node forms a cluster connection to another node, internally it creates a *core bridge* (as described in [Core Bridges](core-bridges.md)) connection between it and the other node, this is done transparently behind the scenes - you don't @@ -84,12 +84,12 @@ broadcasting technique you configure the cluster, it uses either UDP or JGroups to broadcast connector pairs information. Broadcast groups are defined in the server configuration file -`activemq-configuration.xml`. There can be many broadcast groups per +`broker.xml`. There can be many broadcast groups per Apache ActiveMQ Artemis server. All broadcast groups must be defined in a `broadcast-groups` element. Let's take a look at an example broadcast group from -`activemq-configuration.xml` that defines a UDP broadcast group: +`broker.xml` that defines a UDP broadcast group: <broadcast-groups> <broadcast-group name="my-broadcast-group"> @@ -272,7 +272,7 @@ normal Apache ActiveMQ Artemis connections. #### Defining Discovery Groups on the Server For cluster connections, discovery groups are defined in the server side -configuration file `activemq-configuration.xml`. All discovery groups +configuration file `broker.xml`. All discovery groups must be defined inside a `discovery-groups` element. There can be many discovery groups defined by Apache ActiveMQ Artemis server. Let's look at an example: @@ -362,7 +362,7 @@ take a look at an example: connectionFactory.myConnectionFactory=udp://231.7.7.7:9876 The element `discovery-group-ref` specifies the name of a discovery -group defined in `activemq-configuration.xml`. +group defined in `broker.xml`. When this connection factory is downloaded from JNDI by a client application and JMS connections are created from it, those connections @@ -550,7 +550,7 @@ connections in general. Cluster connections group servers into clusters so that messages can be load balanced between the nodes of the cluster. Let's take a look at a typical cluster connection. Cluster connections are always defined in -`activemq-configuration.xml` inside a `cluster-connection` element. +`broker.xml` inside a `cluster-connection` element. There can be zero or more cluster connections defined per Apache ActiveMQ Artemis server. @@ -775,7 +775,7 @@ connection has been made. When creating connections between nodes of a cluster to form a cluster connection, Apache ActiveMQ Artemis uses a cluster user and cluster password which is -defined in `activemq-configuration.xml`: +defined in `broker.xml`: <cluster-user>ACTIVEMQ.CLUSTER.ADMIN.USER</cluster-user> <cluster-password>CHANGE ME!!</cluster-password> @@ -925,7 +925,7 @@ Message redistribution can be configured on a per address basis, by specifying the redistribution delay in the address settings, for more information on configuring address settings, please see [Queue Attributes](queue-attributes.md). -Here's an address settings snippet from `activemq-configuration.xml` +Here's an address settings snippet from `broker.xml` showing how message redistribution is enabled for a set of queues: <address-settings> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/configuration-index.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/configuration-index.md b/docs/user-manual/en/configuration-index.md index 21b8fe6..ae10908 100644 --- a/docs/user-manual/en/configuration-index.md +++ b/docs/user-manual/en/configuration-index.md @@ -7,7 +7,7 @@ element name to go to the specific chapter. Server Configuration ==================== -activemq-configuration.xml +broker.xml -------------------------- This is the main core server configuration file which contains to elements http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/configuring-transports.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/configuring-transports.md b/docs/user-manual/en/configuring-transports.md index b85e4fe..7dd7c23 100644 --- a/docs/user-manual/en/configuring-transports.md +++ b/docs/user-manual/en/configuring-transports.md @@ -7,7 +7,7 @@ Apache ActiveMQ Artemis transports and where and how they're configured. One of the most important concepts in Apache ActiveMQ Artemis transports is the *acceptor*. Let's dive straight in and take a look at an acceptor -defined in xml in the configuration file `activemq-configuration.xml`. +defined in xml in the configuration file `broker.xml`. <acceptors> <acceptor name="netty">tcp://localhost:61617</acceptor> @@ -45,7 +45,7 @@ Whereas acceptors are used on the server to define how we accept connections, connectors are used by a client to define how it connects to a server. -Let's look at a connector defined in our `activemq-configuration.xml` +Let's look at a connector defined in our `broker.xml` file: <connectors> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/connection-ttl.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/connection-ttl.md b/docs/user-manual/en/connection-ttl.md index cd3c301..545e816 100644 --- a/docs/user-manual/en/connection-ttl.md +++ b/docs/user-manual/en/connection-ttl.md @@ -190,5 +190,5 @@ thread adds a little more latency. These packets are: - `org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXARollbackMessage` To disable asynchronous connection execution, set the parameter -`async-connection-execution-enabled` in `activemq-configuration.xml` to +`async-connection-execution-enabled` in `broker.xml` to `false` (default value is `true`). http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/core-bridges.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/core-bridges.md b/docs/user-manual/en/core-bridges.md index d4b5b5e..0b008b0 100644 --- a/docs/user-manual/en/core-bridges.md +++ b/docs/user-manual/en/core-bridges.md @@ -38,7 +38,7 @@ server. They do this by using duplicate detection (described in [Duplicate Detec ## Configuring Bridges -Bridges are configured in `activemq-configuration.xml`. Let's kick off +Bridges are configured in `broker.xml`. Let's kick off with an example (this is actually from the bridge example): <bridge name="my-bridge"> @@ -84,7 +84,7 @@ Let's take a look at all the parameters in turn: > > If you're using JMS then normally the JMS configuration > `activemq-jms.xml` is loaded after the core configuration file - > `activemq-configuration.xml` is loaded. If your bridge is + > `broker.xml` is loaded. If your bridge is > consuming from a JMS queue then you'll need to make sure the JMS > queue is also deployed as a core queue in the core configuration. > Take a look at the bridge example for an example of how this is @@ -204,12 +204,12 @@ Let's take a look at all the parameters in turn: - `user`. This optional parameter determines the user name to use when creating the bridge connection to the remote server. If it is not specified the default cluster user specified by `cluster-user` in - `activemq-configuration.xml` will be used. + `broker.xml` will be used. - `password`. This optional parameter determines the password to use when creating the bridge connection to the remote server. If it is not specified the default cluster password specified by - `cluster-password` in `activemq-configuration.xml` will be used. + `cluster-password` in `broker.xml` will be used. - `static-connectors` or `discovery-group-ref`. Pick either of these options to connect the bridge to the target server. http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/diverts.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/diverts.md b/docs/user-manual/en/diverts.md index c54b9b1..010b509 100644 --- a/docs/user-manual/en/diverts.md +++ b/docs/user-manual/en/diverts.md @@ -34,7 +34,7 @@ for messages. Combining diverts with bridges allows you to create a distributed network of reliable routing connections between multiple geographically distributed servers, creating your global messaging mesh. -Diverts are defined as xml in the `activemq-configuration.xml` file. +Diverts are defined as xml in the `broker.xml` file. There can be zero or more diverts in the file. Please see the examples for a full working example showing you how to http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/duplicate-detection.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/duplicate-detection.md b/docs/user-manual/en/duplicate-detection.md index 6d9efe4..e7b526e 100644 --- a/docs/user-manual/en/duplicate-detection.md +++ b/docs/user-manual/en/duplicate-detection.md @@ -109,12 +109,12 @@ size of `n` elements, then the `n + 1`th id stored will overwrite the `0`th element in the cache. The maximum size of the cache is configured by the parameter -`id-cache-size` in `activemq-configuration.xml`, the default value is +`id-cache-size` in `broker.xml`, the default value is `2000` elements. The caches can also be configured to persist to disk or not. This is configured by the parameter `persist-id-cache`, also in -`activemq-configuration.xml`. If this is set to `true` then each id will +`broker.xml`. If this is set to `true` then each id will be persisted to permanent storage as they are received. The default value for this parameter is `true`. @@ -135,7 +135,7 @@ will be ignored. To configure a core bridge to add the duplicate id header, simply set the `use-duplicate-detection` to `true` when configuring a bridge in -`activemq-configuration.xml`. +`broker.xml`. The default value for this parameter is `true`. @@ -151,7 +151,7 @@ using their internal bridges. To configure a cluster connection to add the duplicate id header, simply set the `use-duplicate-detection` to `true` when configuring a cluster -connection in `activemq-configuration.xml`. +connection in `broker.xml`. The default value for this parameter is `true`. http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/embedding-activemq.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/embedding-activemq.md b/docs/user-manual/en/embedding-activemq.md index dced121..84a078a 100644 --- a/docs/user-manual/en/embedding-activemq.md +++ b/docs/user-manual/en/embedding-activemq.md @@ -27,7 +27,7 @@ using the Apache ActiveMQ Artemis Core API or JMS. For instantiating a core Apache ActiveMQ Artemis Server only, the steps are pretty simple. The example requires that you have defined a configuration file -`activemq-configuration.xml` in your classpath: +`broker.xml` in your classpath: ``` java import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; @@ -72,7 +72,7 @@ properties. See the javadocs for this class for more details. ## JMS API JMS embedding is simple as well. This example requires that you have -defined the config files `activemq-configuration.xml`, +defined the config files `broker.xml`, `activemq-jms.xml`, and a `activemq-users.xml` if you have security enabled. Let's also assume that a queue and connection factory has been defined in the `activemq-jms.xml` config file. http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/filter-expressions.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/filter-expressions.md b/docs/user-manual/en/filter-expressions.md index a958a9d..ea7224e 100644 --- a/docs/user-manual/en/filter-expressions.md +++ b/docs/user-manual/en/filter-expressions.md @@ -11,7 +11,7 @@ please the JMS javadoc for Filter expressions are used in several places in Apache ActiveMQ Artemis - Predefined Queues. When pre-defining a queue, in - `activemq-configuration.xml` in either the core or jms configuration a filter + `broker.xml` in either the core or jms configuration a filter expression can be defined for a queue. Only messages that match the filter expression will enter the queue. http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/ha.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/ha.md b/docs/user-manual/en/ha.md index 2819006..572947b 100644 --- a/docs/user-manual/en/ha.md +++ b/docs/user-manual/en/ha.md @@ -52,7 +52,7 @@ which we will cover in a later chapter. > **Note** > > The `ha-policy` configurations replaces any current HA configuration -> in the root of the `activemq-configuration.xml` configuration. All old +> in the root of the `broker.xml` configuration. All old > configuration is now deprecated altho best efforts will be made to > honour it if configured this way. @@ -140,7 +140,7 @@ live server to replicate from, these are: - `specifying a node group`. You can specify a group of live servers that a backup server can connect to. This is done by configuring `group-name` in either the `master` or the `slave` element of the - `activemq-configuration.xml`. A Backup server will only connect to a + `broker.xml`. A Backup server will only connect to a live server that shares the same node group name - `connecting to any live`. This will be the behaviour if `group-name` @@ -200,7 +200,7 @@ reconnecting with the live. This avoids a split brain situation. #### Configuration To configure the live and backup servers to be a replicating pair, -configure the live server in ' `activemq-configuration.xml` to have: +configure the live server in ' `broker.xml` to have: <ha-policy> <replication> @@ -351,7 +351,7 @@ on amount of data). #### Configuration To configure the live and backup servers to share their store, configure -id via the `ha-policy` configuration in `activemq-configuration.xml`: +id via the `ha-policy` configuration in `broker.xml`: <ha-policy> <shared-store> @@ -426,7 +426,7 @@ other server (which it assumes it is a back that has assumed its duties) to shutdown for it to take over. This is necessary because otherwise the live server has no means to know whether there was a fail-over or not, and if there was if the server that took its duties is still running or -not. To configure this option at your `activemq-configuration.xml` +not. To configure this option at your `broker.xml` configuration file as follows: <ha-policy> @@ -464,7 +464,7 @@ you can do this by using the management API as explained at [Management](managem You can also force the running live server to shutdown when the old live server comes back up allowing the original live server to take over automatically by setting the following property in the -`activemq-configuration.xml` configuration file as follows: +`broker.xml` configuration file as follows: <ha-policy> <shared-store> @@ -566,7 +566,7 @@ its Connectors and Acceptors which are discussed later on in this chapter. A live server can also be configured to allow requests from backups and also how many backups a live server can start. this way you can evenly distribute backups around the cluster. This is configured via -the `ha-policy` element in the `activemq-configuration.xml` file like +the `ha-policy` element in the `broker.xml` file like so: <ha-policy> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/intercepting-operations.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/intercepting-operations.md b/docs/user-manual/en/intercepting-operations.md index f33611b..3b11fe9 100644 --- a/docs/user-manual/en/intercepting-operations.md +++ b/docs/user-manual/en/intercepting-operations.md @@ -42,7 +42,7 @@ The returned boolean value is important: ## Configuring The Interceptors Both incoming and outgoing interceptors are configured in -`activemq-configuration.xml`: +`broker.xml`: <remoting-incoming-interceptors> <class-name>org.apache.activemq.jms.example.LoginInterceptor</class-name> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/management.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/management.md b/docs/user-manual/en/management.md index f44eff1..1d1d8ea 100644 --- a/docs/user-manual/en/management.md +++ b/docs/user-manual/en/management.md @@ -504,7 +504,7 @@ proxies of the MBeans. By default, JMX is enabled to manage Apache ActiveMQ Artemis. It can be disabled by setting `jmx-management-enabled` to `false` in -`activemq-configuration.xml`: +`broker.xml`: <!-- false to disable JMX management for Apache ActiveMQ Artemis --> <jmx-management-enabled>false</jmx-management-enabled> @@ -522,7 +522,7 @@ If JMX is enabled, Apache ActiveMQ Artemis can be managed locally using `jconsol By default, Apache ActiveMQ Artemis server uses the JMX domain "org.apache.activemq". To manage several Apache ActiveMQ Artemis servers from the *same* MBeanServer, the JMX domain can be configured for each individual Apache ActiveMQ Artemis server by setting -`jmx-domain` in `activemq-configuration.xml`: +`jmx-domain` in `broker.xml`: <!-- use a specific JMX domain for ActiveMQ MBeans --> <jmx-domain>my.org.apache.activemq</jmx-domain> @@ -623,7 +623,7 @@ straightforward (`core.queue.exampleQueue` for the Core Queue ### Configuring Core Management The management address to send management messages is configured in -`activemq-configuration.xml`: +`broker.xml`: <management-address>jms.queue.activemq.management</management-address> @@ -633,7 +633,7 @@ messages). The management address requires a *special* user permission `manage` to be able to receive and handle management messages. This is also -configured in activemq-configuration.xml: +configured in broker.xml: <!-- users with the admin role will be allowed to manage --> <!-- Apache ActiveMQ Artemis using management messages --> @@ -741,7 +741,7 @@ of all the notifications emitted by the server. #### Configuring The Core Management Notification Address The management notification address to receive management notifications -is configured in `activemq-configuration.xml`: +is configured in `broker.xml`: <management-notification-address>activemq.notifications</management-notification-address> @@ -948,7 +948,7 @@ By default, message counters are disabled as it might have a small negative effect on memory. To enable message counters, you can set it to `true` in -`activemq-configuration.xml`: +`broker.xml`: <message-counter-enabled>true</message-counter-enabled> @@ -956,7 +956,7 @@ Message counters keeps a history of the queue metrics (10 days by default) and samples all the queues at regular interval (10 seconds by default). If message counters are enabled, these values should be configured to suit your messaging use case in -`activemq-configuration.xml`: +`broker.xml`: <!-- keep history for a week --> <message-counter-max-day-history>7</message-counter-max-day-history> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/message-expiry.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/message-expiry.md b/docs/user-manual/en/message-expiry.md index 61d3d94..39a4134 100644 --- a/docs/user-manual/en/message-expiry.md +++ b/docs/user-manual/en/message-expiry.md @@ -61,7 +61,7 @@ A reaper thread will periodically inspect the queues to check if messages have expired. The reaper thread can be configured with the following properties in -`activemq-configuration.xml` +`broker.xml` - `message-expiry-scan-period` http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/message-grouping.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/message-grouping.md b/docs/user-manual/en/message-grouping.md index cf520fb..09d76d3 100644 --- a/docs/user-manual/en/message-grouping.md +++ b/docs/user-manual/en/message-grouping.md @@ -104,7 +104,7 @@ choose 1 node to have a local grouping handler and all the other nodes should have remote handlers- it's the local handler that actually makes the decision as to what route should be used, all the other remote handlers converse with this. Here is a sample config for both types of -handler, this should be configured in the *activemq-configuration.xml* +handler, this should be configured in the *broker.xml* file. <grouping-handler name="my-grouping-handler"> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/paging.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/paging.md b/docs/user-manual/en/paging.md index d6c5171..f6b92cf 100644 --- a/docs/user-manual/en/paging.md +++ b/docs/user-manual/en/paging.md @@ -41,7 +41,7 @@ Consumers with selectors will also navigate through the page-files and it will i You can configure the location of the paging folder Global paging parameters are specified on the main configuration file -(`activemq-configuration.xml`). +(`broker.xml`). <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; @@ -72,7 +72,7 @@ that address alone goes into page mode. ## Configuration Configuration is done at the address settings, done at the main -configuration file (`activemq-configuration.xml`). +configuration file (`broker.xml`). <address-settings> <address-setting match="jms.someaddress"> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/perf-tuning.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/perf-tuning.md b/docs/user-manual/en/perf-tuning.md index 14d1960..b9de082 100644 --- a/docs/user-manual/en/perf-tuning.md +++ b/docs/user-manual/en/perf-tuning.md @@ -95,21 +95,21 @@ tuning: - Disable security. You may get a small performance boost by disabling security by setting the `security-enabled` parameter to `false` in - `activemq-configuration.xml`. + `broker.xml`. - Disable persistence. If you don't need message persistence, turn it off altogether by setting `persistence-enabled` to false in - `activemq-configuration.xml`. + `broker.xml`. - Sync transactions lazily. Setting `journal-sync-transactional` to - `false` in `activemq-configuration.xml` can give you better + `false` in `broker.xml` can give you better transactional persistent performance at the expense of some possibility of loss of transactions on failure. See [Guarantees of sends and commits](send-guarantees.md) for more information. - Sync non transactional lazily. Setting `journal-sync-non-transactional` to `false` in - `activemq-configuration.xml` can give you better non-transactional + `broker.xml` can give you better non-transactional persistent performance at the expense of some possibility of loss of durable messages on failure. See [Guarantees of sends and commits](send-guarantees.md) for more information. @@ -176,7 +176,7 @@ tuning: - Use `batch-delay` and set `direct-deliver` to false for the best throughput for very small messages. Apache ActiveMQ Artemis comes with a preconfigured connector/acceptor pair (`netty-throughput`) in - `activemq-configuration.xml` and JMS connection factory + `broker.xml` and JMS connection factory (`ThroughputConnectionFactory`) in `activemq-jms.xml`which can be used to give the very best throughput, especially for small messages. See the [Configuring the Transport](configuring-transports.md) http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/persistence.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/persistence.md b/docs/user-manual/en/persistence.md index e6f59f5..c5f0862 100644 --- a/docs/user-manual/en/persistence.md +++ b/docs/user-manual/en/persistence.md @@ -129,7 +129,7 @@ the broker for Zero Persistence section. ## Configuring the bindings journal The bindings journal is configured using the following attributes in -`activemq-configuration.xml` +`broker.xml` - `bindings-directory` @@ -150,7 +150,7 @@ The jms config shares its configuration with the bindings journal. ## Configuring the message journal The message journal is configured using the following attributes in -`activemq-configuration.xml` +`broker.xml` - `journal-directory` @@ -349,7 +349,7 @@ Using aptitude, (e.g. on Ubuntu or Debian system): In some situations, zero persistence is sometimes required for a messaging system. Configuring Apache ActiveMQ Artemis to perform zero persistence is straightforward. Simply set the parameter `persistence-enabled` in -`activemq-configuration.xml` to `false`. +`broker.xml` to `false`. Please note that if you set this parameter to false, then *zero* persistence will occur. That means no bindings data, message data, large http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/queue-attributes.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/queue-attributes.md b/docs/user-manual/en/queue-attributes.md index e515d06..a49d06a 100644 --- a/docs/user-manual/en/queue-attributes.md +++ b/docs/user-manual/en/queue-attributes.md @@ -10,7 +10,7 @@ attribute has. Queues can be predefined via configuration at a core level or at a JMS level. Firstly let's look at a JMS level. -The following shows a queue predefined in the jms element of the `activemq-configuration.xml` +The following shows a queue predefined in the jms element of the `broker.xml` configuration file. <queue name="selectorQueue"> @@ -36,7 +36,7 @@ The durable element specifies whether the queue will be persisted. This again is optional and defaults to true if omitted. Secondly a queue can be predefined at a core level in the -`activemq-configuration.xml` file. The following is an example. +`broker.xml` file. The following is an example. <queues> <queue name="jms.queue.selectorQueue"> @@ -78,7 +78,7 @@ queues. There are some attributes that are defined against an address wildcard rather than a specific queue. Here an example of an `address-setting` -entry that would be found in the `activemq-configuration.xml` file. +entry that would be found in the `broker.xml` file. <address-settings> <address-setting match="jms.queue.exampleQueue"> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac5bb8fd/docs/user-manual/en/rest.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/rest.md b/docs/user-manual/en/rest.md index a8a990d..ff41479 100644 --- a/docs/user-manual/en/rest.md +++ b/docs/user-manual/en/rest.md @@ -190,7 +190,7 @@ The project structure should look this like: `-- src `-- main `-- resources - `-- activemq-configuration.xml + `-- broker.xml `-- webapp `-- WEB-INF `-- web.xml
