Merge #18
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/09123d65 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/09123d65 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/09123d65 Branch: refs/heads/master Commit: 09123d65de3f115b4a7b00d4767b98a0f8fdc5ff Parents: 2fbd5d7 e91ef71 Author: jbertram <jbert...@redhat.com> Authored: Wed Nov 19 09:33:27 2014 -0600 Committer: jbertram <jbert...@redhat.com> Committed: Wed Nov 19 09:33:27 2014 -0600 ---------------------------------------------------------------------- NOTICE | 8 +- RELEASING.md | 8 +- .../org/apache/activemq/cli/banner.txt | 2 +- activemq-native/README | 2 +- .../java/org/apache/activemq/ra/package.html | 2 +- .../src/main/resources/schema/hornetq-rest.xsd | 14 +-- .../test/resources/activemq-configuration.xml | 2 +- .../src/test/resources/activemq-jms.xml | 2 +- .../src/test/resources/activemq-users.xml | 2 +- .../org/apache/activemq/security/basic-security | 2 +- .../resources/ConfigurationTest-defaults.xml | 2 +- .../resources/ConfigurationTest-full-config.xml | 2 +- .../resources/InvalidConfigurationTest0.xml | 2 +- .../resources/InvalidConfigurationTest1.xml | 2 +- .../resources/InvalidConfigurationTest2.xml | 2 +- .../resources/InvalidConfigurationTest3.xml | 2 +- .../resources/InvalidConfigurationTest4.xml | 2 +- .../resources/InvalidConfigurationTest5.xml | 2 +- .../resources/colocated-hapolicy-config.xml | 2 +- .../resources/colocated-hapolicy-config2.xml | 2 +- .../resources/divertRoutingNameNotRequired.xml | 2 +- .../resources/live-only-hapolicy-config.xml | 2 +- .../resources/live-only-hapolicy-config2.xml | 2 +- .../resources/live-only-hapolicy-config3.xml | 2 +- .../resources/live-only-hapolicy-config4.xml | 2 +- .../resources/live-only-hapolicy-config5.xml | 2 +- .../test/resources/replica-hapolicy-config.xml | 2 +- .../test/resources/replica-hapolicy-config2.xml | 2 +- .../test/resources/replica-hapolicy-config3.xml | 2 +- .../resources/replicated-hapolicy-config.xml | 2 +- .../shared-store-master-hapolicy-config.xml | 2 +- .../shared-store-slave-hapolicy-config.xml | 2 +- .../shared-store-slave-hapolicy-config2.xml | 2 +- .../shared-store-slave-hapolicy-config3.xml | 2 +- .../config/clustered/activemq-configuration.xml | 2 +- .../resources/config/clustered/activemq-jms.xml | 2 +- .../main/resources/config/logging.properties | 2 +- .../non-clustered/activemq-configuration.xml | 2 +- .../config/non-clustered/activemq-jms.xml | 2 +- .../replicated/activemq-configuration.xml | 2 +- .../config/replicated/activemq-jms.xml | 2 +- .../shared-store/activemq-configuration.xml | 2 +- .../config/shared-store/activemq-jms.xml | 2 +- docs/README.html | 8 +- docs/design-guide/en/Author_Group.xml | 2 +- docs/design-guide/en/Book_Info.xml | 12 +- docs/design-guide/en/HornetQ_Design_Guide.ent | 4 +- docs/design-guide/en/HornetQ_Design_Guide.xml | 2 +- docs/design-guide/en/about.xml | 6 +- docs/design-guide/en/clustering.xml | 2 +- docs/design-guide/en/notice.xml | 2 +- docs/design-guide/pom.xml | 4 +- docs/eap-manual/en/Author_Group.xml | 2 +- docs/eap-manual/en/Book_Info.xml | 12 +- docs/eap-manual/en/HornetQ_EAP_Manual.ent | 4 +- docs/eap-manual/en/HornetQ_EAP_Manual.xml | 2 +- docs/eap-manual/en/clusters.xml | 30 ++--- docs/eap-manual/pom.xml | 4 +- docs/quickstart-guide/en/Author_Group.xml | 2 +- docs/quickstart-guide/en/Book_Info.xml | 12 +- .../en/HornetQ_QuickStart_Guide.ent | 4 +- .../en/HornetQ_QuickStart_Guide.xml | 2 +- docs/quickstart-guide/en/about.xml | 22 ++-- docs/quickstart-guide/en/download.xml | 8 +- docs/quickstart-guide/en/examples.xml | 48 ++++---- docs/quickstart-guide/en/installation.xml | 26 ++-- docs/quickstart-guide/en/introduction.xml | 6 +- docs/quickstart-guide/en/notice.xml | 2 +- docs/quickstart-guide/en/running.xml | 20 ++-- docs/quickstart-guide/pom.xml | 4 +- docs/quickstart-guide/zh/about.xml | 24 ++-- docs/quickstart-guide/zh/download.xml | 12 +- docs/quickstart-guide/zh/examples.xml | 22 ++-- docs/quickstart-guide/zh/installation.xml | 46 +++---- docs/quickstart-guide/zh/introduction.xml | 8 +- docs/quickstart-guide/zh/master.xml | 2 +- docs/quickstart-guide/zh/running.xml | 28 ++--- docs/user-manual/zh/appserver-integration.xml | 90 +++++++------- docs/user-manual/zh/architecture.xml | 50 ++++---- docs/user-manual/zh/client-classpath.xml | 8 +- docs/user-manual/zh/client-reconnection.xml | 10 +- docs/user-manual/zh/clusters.xml | 67 +++++------ docs/user-manual/zh/configuration-index.xml | 6 +- docs/user-manual/zh/configuring-transports.xml | 52 ++++---- docs/user-manual/zh/connection-ttl.xml | 18 +-- docs/user-manual/zh/core-bridges.xml | 6 +- docs/user-manual/zh/diverts.xml | 4 +- docs/user-manual/zh/duplicate-detection.xml | 8 +- docs/user-manual/zh/embedding-hornetq.xml | 66 +++++----- docs/user-manual/zh/examples.xml | 120 +++++++++---------- docs/user-manual/zh/filter-expressions.xml | 6 +- docs/user-manual/zh/flow-control.xml | 22 ++-- docs/user-manual/zh/ha.xml | 44 +++---- docs/user-manual/zh/intercepting-operations.xml | 2 +- docs/user-manual/zh/interoperability.xml | 32 ++--- docs/user-manual/zh/jms-bridge.xml | 22 ++-- docs/user-manual/zh/jms-core-mapping.xml | 4 +- docs/user-manual/zh/large-messages.xml | 20 ++-- docs/user-manual/zh/libaio.xml | 20 ++-- docs/user-manual/zh/logging.xml | 8 +- docs/user-manual/zh/management.xml | 76 ++++++------ docs/user-manual/zh/master.xml | 2 +- docs/user-manual/zh/message-expiry.xml | 8 +- docs/user-manual/zh/message-grouping.xml | 6 +- docs/user-manual/zh/messaging-concepts.xml | 26 ++-- docs/user-manual/zh/paging.xml | 16 +-- docs/user-manual/zh/perf-tuning.xml | 16 +-- docs/user-manual/zh/persistence.xml | 44 +++---- docs/user-manual/zh/pre-acknowledge.xml | 8 +- docs/user-manual/zh/preface.xml | 24 ++-- docs/user-manual/zh/project-info.xml | 14 +-- docs/user-manual/zh/queue-attributes.xml | 2 +- docs/user-manual/zh/security.xml | 48 ++++---- docs/user-manual/zh/send-guarantees.xml | 14 +-- docs/user-manual/zh/thread-pooling.xml | 24 ++-- docs/user-manual/zh/transaction-config.xml | 8 +- docs/user-manual/zh/undelivered-messages.xml | 8 +- docs/user-manual/zh/using-core.xml | 22 ++-- docs/user-manual/zh/using-jms.xml | 34 +++--- docs/user-manual/zh/using-server.xml | 108 ++++++++--------- docs/user-manual/zh/wildcard-routing.xml | 2 +- docs/user-manual/zh/wildcard-syntax.xml | 6 +- etc/IDEA-style.jar | Bin 3551 -> 3553 bytes etc/findbugs-exclude.xml | 6 +- etc/org.eclipse.jdt.ui.prefs | 4 +- examples/core/embedded-remote/readme.html | 14 +-- examples/core/embedded/readme.html | 14 +-- .../server0/activemq-configuration.xml | 2 +- .../hornetq-configuration-messaging-lab.xml | 2 +- examples/core/twitter-connector/readme.html | 8 +- .../server0/activemq-configuration.xml | 2 +- .../src/main/resources/server0/activemq-jms.xml | 2 +- .../main/resources/server0/activemq-users.xml | 2 +- examples/core/vertx-connector/readme.html | 10 +- .../server0/activemq-configuration.xml | 2 +- .../src/main/resources/server0/activemq-jms.xml | 2 +- .../main/resources/server0/activemq-users.xml | 2 +- examples/javaee/ejb-jms-transaction/readme.html | 2 +- examples/javaee/jca-config/readme.html | 8 +- examples/javaee/jca-remote/readme.html | 8 +- examples/javaee/jms-bridge/readme.html | 4 +- .../javaee/jms-context-injection/readme.html | 2 +- examples/javaee/mdb-bmt/readme.html | 2 +- .../readme.html | 2 +- .../javaee/mdb-cmt-setrollbackonly/readme.html | 2 +- examples/javaee/mdb-cmt-tx-local/readme.html | 2 +- .../javaee/mdb-cmt-tx-not-supported/readme.html | 2 +- examples/javaee/mdb-cmt-tx-required/readme.html | 2 +- .../javaee/mdb-message-selector/readme.html | 2 +- .../mdb-remote-failover-static/readme.html | 2 +- examples/javaee/mdb-remote-failover/readme.html | 2 +- examples/javaee/mdb-tx-send/readme.html | 2 +- examples/javaee/xarecovery/readme.html | 6 +- examples/jms/README.md | 2 +- .../config/logging.properties | 4 +- .../activemq-ra-rar/src/main/resources/ra.xml | 16 +-- examples/jms/aerogear/readme.html | 10 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/applet/applet.html | 6 +- examples/jms/applet/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../jms/application-layer-failover/readme.html | 12 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- examples/jms/bridge/readme.html | 10 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- examples/jms/browser/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/client-kickoff/readme.html | 20 ++-- .../hornetq/server0/activemq-configuration.xml | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../client-side-failoverlistener/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- .../jms/client-side-load-balancing/readme.html | 8 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- .../hornetq/server2/activemq-configuration.xml | 2 +- .../resources/hornetq/server2/activemq-jms.xml | 2 +- .../hornetq/server2/activemq-users.xml | 2 +- .../clustered-durable-subscription/readme.html | 6 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- examples/jms/clustered-grouping/readme.html | 10 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- .../hornetq/server2/activemq-configuration.xml | 2 +- .../resources/hornetq/server2/activemq-jms.xml | 2 +- .../hornetq/server2/activemq-users.xml | 2 +- examples/jms/clustered-jgroups/readme.html | 12 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- examples/jms/clustered-queue/readme.html | 10 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- examples/jms/clustered-standalone/readme.html | 2 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- .../hornetq/server2/activemq-configuration.xml | 2 +- .../resources/hornetq/server2/activemq-jms.xml | 2 +- .../hornetq/server2/activemq-users.xml | 2 +- .../jms/clustered-static-discovery/readme.html | 10 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- .../hornetq/server2/activemq-configuration.xml | 2 +- .../resources/hornetq/server2/activemq-jms.xml | 2 +- .../hornetq/server2/activemq-users.xml | 2 +- .../hornetq/server3/activemq-configuration.xml | 2 +- .../resources/hornetq/server3/activemq-jms.xml | 2 +- .../hornetq/server3/activemq-users.xml | 2 +- .../jms/clustered-static-oneway/readme.html | 10 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- .../hornetq/server2/activemq-configuration.xml | 2 +- .../resources/hornetq/server2/activemq-jms.xml | 2 +- .../hornetq/server2/activemq-users.xml | 2 +- examples/jms/clustered-topic/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- .../colocated-failover-scale-down/readme.html | 2 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- examples/jms/colocated-failover/readme.html | 2 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- examples/jms/consumer-rate-limit/readme.html | 6 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/dead-letter/readme.html | 10 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/delayed-redelivery/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/divert/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- examples/jms/durable-subscription/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/embedded-simple/readme.html | 8 +- .../main/resources/activemq-configuration.xml | 2 +- .../src/main/resources/activemq-jms.xml | 2 +- .../src/main/resources/activemq-users.xml | 2 +- examples/jms/embedded/readme.html | 14 +-- examples/jms/expiry/readme.html | 12 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- examples/jms/http-transport/readme.html | 8 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../instantiate-connection-factory/readme.html | 8 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/interceptor/readme.html | 6 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/jaas/readme.html | 14 +-- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- examples/jms/jms-auto-closeable/readme.html | 2 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/jms-bridge/readme.html | 12 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../resources/hornetq/server0/hornetq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- .../jms/jms-completion-listener/readme.html | 6 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/jms-context/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/jms-shared-consumer/readme.html | 2 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/jmx/readme.html | 8 +- .../hornetq/server0/activemq-configuration.xml | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/large-message/readme.html | 12 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/last-value-queue/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../jms/management-notifications/readme.html | 10 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/management/readme.html | 12 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/message-counters/readme.html | 8 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/message-group/readme.html | 6 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../resources/hornetq/server0/hornetq-jms.xml | 2 +- examples/jms/message-group2/readme.html | 6 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/message-priority/readme.html | 2 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- .../hornetq/server2/activemq-configuration.xml | 2 +- .../resources/hornetq/server2/activemq-jms.xml | 2 +- .../hornetq/server2/activemq-users.xml | 2 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- .../hornetq/server2/activemq-configuration.xml | 2 +- .../resources/hornetq/server2/activemq-jms.xml | 2 +- .../hornetq/server2/activemq-users.xml | 2 +- examples/jms/no-consumer-buffering/readme.html | 10 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../jms/non-transaction-failover/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- examples/jms/openwire/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/paging/readme.html | 6 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/perf/readme.html | 2 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq-configuration-messaging-lab.xml | 2 +- examples/jms/pre-acknowledge/readme.html | 10 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/producer-rate-limit/readme.html | 6 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/proton-cpp/readme.html | 10 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/proton-j/readme.html | 10 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/proton-ruby/readme.html | 6 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../queue-message-redistribution/readme.html | 14 +-- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- examples/jms/queue-requestor/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/queue-selector/readme.html | 2 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/queue/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/reattach-node/readme.html | 8 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../jms/replicated-failback-static/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- examples/jms/replicated-failback/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- .../replicated-multiple-failover/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- .../hornetq/server2/activemq-configuration.xml | 2 +- .../resources/hornetq/server2/activemq-jms.xml | 2 +- .../hornetq/server2/activemq-users.xml | 2 +- .../replicated-transaction-failover/readme.html | 6 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- examples/jms/request-reply/readme.html | 2 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/rest/dup-send/README.txt | 2 +- .../main/resources/activemq-configuration.xml | 2 +- .../src/main/resources/activemq-jms.xml | 2 +- .../src/main/resources/activemq-users.xml | 2 +- .../src/main/resources/hornetq-client.xml | 2 +- examples/jms/rest/javascript-chat/README.txt | 2 +- .../main/resources/activemq-configuration.xml | 2 +- .../src/main/resources/activemq-jms.xml | 2 +- .../src/main/resources/activemq-users.xml | 2 +- examples/jms/rest/jms-to-rest/README.txt | 2 +- .../main/resources/activemq-configuration.xml | 2 +- .../src/main/resources/activemq-jms.xml | 2 +- .../src/main/resources/activemq-users.xml | 2 +- .../src/main/resources/hornetq-client.xml | 2 +- examples/jms/rest/push/README.txt | 4 +- .../main/resources/activemq-configuration.xml | 2 +- .../push/src/main/resources/activemq-jms.xml | 2 +- .../push/src/main/resources/activemq-users.xml | 2 +- .../push/src/main/resources/hornetq-client.xml | 2 +- examples/jms/scale-down/readme.html | 2 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- examples/jms/scheduled-message/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/security/readme.html | 18 +-- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/send-acknowledgements/readme.html | 6 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/spring-integration/readme.html | 6 +- .../main/resources/activemq-configuration.xml | 2 +- .../src/main/resources/activemq-jms.xml | 2 +- .../src/main/resources/activemq-users.xml | 2 +- examples/jms/ssl-enabled/readme.html | 6 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/static-selector-jms/readme.html | 6 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/static-selector/readme.html | 8 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/stomp-websockets/readme.html | 8 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/stomp/readme.html | 8 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/stomp1.1/readme.html | 8 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/stomp1.2/readme.html | 8 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/stop-server-failover/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- examples/jms/symmetric-cluster/readme.html | 18 +-- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- .../hornetq/server2/activemq-configuration.xml | 2 +- .../resources/hornetq/server2/activemq-jms.xml | 2 +- .../hornetq/server2/activemq-users.xml | 2 +- .../hornetq/server3/activemq-configuration.xml | 2 +- .../resources/hornetq/server3/activemq-jms.xml | 2 +- .../hornetq/server3/activemq-users.xml | 2 +- .../hornetq/server4/activemq-configuration.xml | 2 +- .../resources/hornetq/server4/activemq-jms.xml | 2 +- .../hornetq/server4/activemq-users.xml | 2 +- .../hornetq/server5/activemq-configuration.xml | 2 +- .../resources/hornetq/server5/activemq-jms.xml | 2 +- .../hornetq/server5/activemq-users.xml | 2 +- examples/jms/temp-queue/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/topic-hierarchies/readme.html | 14 +-- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../jms/topic-selector-example1/readme.html | 2 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../jms/topic-selector-example2/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/topic/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/transaction-failover/readme.html | 6 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../resources/hornetq/server1/activemq-jms.xml | 2 +- .../hornetq/server1/activemq-users.xml | 2 +- examples/jms/transactional/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/xa-heuristic/readme.html | 6 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/xa-receive/readme.html | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/xa-send/readme.html | 6 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/xa-with-jta/readme.html | 6 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 2 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/soak/normal/README | 2 +- .../normal/server0/activemq-configuration.xml | 2 +- examples/soak/normal/server0/activemq-jms.xml | 2 +- tests/config/logging.properties | 2 +- tests/config/logging.properties.trace | 2 +- .../config/server-start-stop-backup-config1.xml | 2 +- .../server-start-stop-backup-jms-config1.xml | 2 +- tests/config/server-start-stop-live-config1.xml | 2 +- .../server-start-stop-live-jms-config1.xml | 2 +- .../activemq-jms-for-JMSServerDeployerTest.xml | 2 +- .../activemq-jms-for-JMSServerDeployerTest2.xml | 2 +- .../colocated-server-start-stop-config1.xml | 2 +- .../colocated-server-start-stop-config2.xml | 2 +- .../colocated-server-start-stop-jms-config1.xml | 2 +- .../colocated-server-start-stop-jms-config2.xml | 2 +- .../resources/server-start-stop-config1.xml | 2 +- .../resources/server-start-stop-jms-config1.xml | 2 +- .../test/resources/spring-activemq-config.xml | 2 +- .../src/test/resources/spring-activemq-jms.xml | 2 +- .../src/test/resources/jbossjta-properties.xml | 2 +- 681 files changed, 1676 insertions(+), 1677 deletions(-) ----------------------------------------------------------------------
