You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by an...@apache.org on 2014/11/20 09:57:54 UTC
[9/9] activemq-6 git commit: merge #19 name changes
merge #19 name changes
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/3c83324b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/3c83324b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/3c83324b
Branch: refs/heads/master
Commit: 3c83324bb742396d7b1b245200ef38a554f158f7
Parents: 09123d6 9b828d2
Author: Andy Taylor <an...@gmail.com>
Authored: Thu Nov 20 08:56:27 2014 +0000
Committer: Andy Taylor <an...@gmail.com>
Committed: Thu Nov 20 08:56:27 2014 +0000
----------------------------------------------------------------------
.gitignore | 52 ++++++-------
.project | 2 +-
RELEASING.md | 4 +-
activemq-bootstrap/pom.xml | 2 +-
activemq-commons/pom.xml | 2 +-
activemq-core-client/pom.xml | 2 +-
.../core/client/impl/ClientConsumerImpl.java | 5 +-
activemq-dto/pom.xml | 4 +-
activemq-jms-client/pom.xml | 2 +-
activemq-jms-server/pom.xml | 2 +-
.../src/main/resources/schema/activemq-jms.xsd | 2 +-
activemq-journal/pom.xml | 2 +-
activemq-native/pom.xml | 2 +-
.../activemq-amqp-protocol/pom.xml | 2 +-
.../activemq-openwire-protocol/pom.xml | 2 +-
activemq-protocols/activemq-proton-plug/pom.xml | 2 +-
.../activemq-stomp-protocol/pom.xml | 2 +-
activemq-protocols/pom.xml | 2 +-
activemq-ra/pom.xml | 2 +-
activemq-rest/pom.xml | 4 +-
activemq-selector/pom.xml | 2 +-
activemq-server/pom.xml | 2 +-
.../resources/ConfigurationTest-full-config.xml | 2 +-
.../resources/colocated-hapolicy-config.xml | 2 +-
.../resources/colocated-hapolicy-config2.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 +-
.../src/test/resources/logging.properties | 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 +-
activemq-tools/pom.xml | 2 +-
.../config/clustered/activemq-configuration.xml | 16 ++--
.../resources/config/clustered/bootstrap.xml | 2 +-
.../main/resources/config/logging.properties | 2 +-
.../non-clustered/activemq-configuration.xml | 16 ++--
.../config/non-clustered/bootstrap.xml | 2 +-
.../replicated/activemq-configuration.xml | 16 ++--
.../resources/config/replicated/bootstrap.xml | 2 +-
.../shared-store/activemq-configuration.xml | 16 ++--
.../resources/config/shared-store/bootstrap.xml | 2 +-
docs/eap-manual/en/clusters.xml | 42 +++++-----
docs/quickstart-guide/en/download.xml | 24 +++---
docs/quickstart-guide/en/examples.xml | 80 ++++++++++----------
docs/quickstart-guide/en/running.xml | 12 +--
docs/quickstart-guide/zh/download.xml | 22 +++---
docs/quickstart-guide/zh/examples.xml | 22 +++---
docs/quickstart-guide/zh/installation.xml | 12 +--
docs/quickstart-guide/zh/running.xml | 2 +-
docs/user-manual/user-manual.xpr | 2 +-
docs/user-manual/zh/appserver-integration.xml | 36 ++++-----
docs/user-manual/zh/architecture.xml | 4 +-
docs/user-manual/zh/client-classpath.xml | 4 +-
docs/user-manual/zh/client-reconnection.xml | 4 +-
docs/user-manual/zh/clusters.xml | 6 +-
docs/user-manual/zh/configuration-index.xml | 6 +-
docs/user-manual/zh/configuring-transports.xml | 4 +-
docs/user-manual/zh/connection-ttl.xml | 2 +-
docs/user-manual/zh/core-bridges.xml | 2 +-
docs/user-manual/zh/embedding-hornetq.xml | 6 +-
docs/user-manual/zh/filter-expressions.xml | 2 +-
docs/user-manual/zh/flow-control.xml | 8 +-
docs/user-manual/zh/ha.xml | 4 +-
docs/user-manual/zh/large-messages.xml | 2 +-
docs/user-manual/zh/management.xml | 16 ++--
docs/user-manual/zh/master.xml | 4 +-
docs/user-manual/zh/message-grouping.xml | 4 +-
docs/user-manual/zh/perf-tuning.xml | 4 +-
docs/user-manual/zh/persistence.xml | 14 ++--
docs/user-manual/zh/pre-acknowledge.xml | 2 +-
docs/user-manual/zh/project-info.xml | 20 ++---
docs/user-manual/zh/queue-attributes.xml | 2 +-
docs/user-manual/zh/security.xml | 10 +--
docs/user-manual/zh/send-guarantees.xml | 2 +-
docs/user-manual/zh/thread-pooling.xml | 2 +-
docs/user-manual/zh/using-jms.xml | 4 +-
docs/user-manual/zh/using-server.xml | 16 ++--
etc/checkstyle.xml | 1 +
etc/findbugs-exclude.xml | 6 +-
examples/core/embedded/readme.html | 2 +-
.../hornetq-configuration-messaging-lab.xml | 8 +-
.../configuration/standalone-example.xml | 8 +-
examples/javaee/jca-config/readme.html | 2 +-
.../configuration/standalone-example.xml | 8 +-
.../configuration/standalone-example2.xml | 10 +--
examples/javaee/jca-remote/readme.html | 6 +-
.../configuration/standalone-example.xml | 10 +--
.../configuration/standalone-example2.xml | 8 +-
examples/javaee/jms-bridge/readme.html | 2 +-
.../configuration/standalone-example.xml | 8 +-
.../configuration/standalone-example.xml | 8 +-
.../configuration/standalone-example.xml | 8 +-
.../configuration/standalone-example.xml | 8 +-
.../configuration/standalone-example.xml | 8 +-
.../configuration/standalone-example.xml | 8 +-
.../configuration/standalone-example.xml | 8 +-
.../configuration/standalone-example.xml | 8 +-
.../configuration/standalone-example.xml | 8 +-
.../configuration/standalone-backup.xml | 8 +-
.../configuration/standalone-example.xml | 10 +--
.../configuration/standalone-live.xml | 8 +-
.../configuration/standalone-backup.xml | 8 +-
.../configuration/standalone-example.xml | 10 +--
.../configuration/standalone-live.xml | 8 +-
.../configuration/standalone-example.xml | 8 +-
examples/javaee/pom.xml | 8 +-
.../configuration/standalone-example.xml | 8 +-
examples/jms/README.md | 2 +-
.../config/logging.properties | 2 +-
examples/jms/aerogear/pom.xml | 2 +-
examples/jms/aerogear/readme.html | 2 +-
examples/jms/applet/applet.html | 2 +-
examples/jms/applet/pom.xml | 6 +-
examples/jms/application-layer-failover/pom.xml | 12 +--
examples/jms/bridge/pom.xml | 10 +--
examples/jms/bridge/readme.html | 2 +-
examples/jms/browser/pom.xml | 2 +-
examples/jms/client-kickoff/pom.xml | 2 +-
examples/jms/client-kickoff/readme.html | 2 +-
.../jms/client-side-failoverlistener/pom.xml | 10 +--
.../client-side-failoverlistener/readme.html | 2 +-
.../hornetq/server0/activemq-configuration.xml | 2 +-
.../hornetq/server1/activemq-configuration.xml | 2 +-
examples/jms/client-side-load-balancing/pom.xml | 14 ++--
.../jms/client-side-load-balancing/readme.html | 2 +-
.../jms/clustered-durable-subscription/pom.xml | 10 +--
examples/jms/clustered-grouping/pom.xml | 14 ++--
examples/jms/clustered-jgroups/pom.xml | 8 +-
examples/jms/clustered-queue/pom.xml | 8 +-
examples/jms/clustered-standalone/pom.xml | 14 ++--
examples/jms/clustered-static-discovery/pom.xml | 18 ++---
examples/jms/clustered-static-oneway/pom.xml | 14 ++--
examples/jms/clustered-topic/pom.xml | 10 +--
.../jms/colocated-failover-scale-down/pom.xml | 10 +--
examples/jms/colocated-failover/pom.xml | 10 +--
examples/jms/consumer-rate-limit/pom.xml | 2 +-
examples/jms/consumer-rate-limit/readme.html | 4 +-
examples/jms/dead-letter/pom.xml | 2 +-
examples/jms/dead-letter/readme.html | 4 +-
examples/jms/delayed-redelivery/pom.xml | 2 +-
examples/jms/delayed-redelivery/readme.html | 2 +-
examples/jms/divert/pom.xml | 10 +--
examples/jms/divert/readme.html | 2 +-
examples/jms/durable-subscription/pom.xml | 2 +-
examples/jms/embedded-simple/pom.xml | 4 +-
examples/jms/embedded-simple/readme.html | 2 +-
examples/jms/embedded/pom.xml | 2 +-
examples/jms/expiry/pom.xml | 2 +-
examples/jms/expiry/readme.html | 4 +-
examples/jms/ha-policy-autobackup/pom.xml | 10 +--
examples/jms/http-transport/pom.xml | 2 +-
examples/jms/http-transport/readme.html | 8 +-
.../jms/instantiate-connection-factory/pom.xml | 2 +-
examples/jms/interceptor/pom.xml | 2 +-
examples/jms/interceptor/readme.html | 2 +-
examples/jms/jaas/pom.xml | 2 +-
examples/jms/jaas/readme.html | 8 +-
examples/jms/jms-auto-closeable/pom.xml | 2 +-
examples/jms/jms-bridge/pom.xml | 10 +--
examples/jms/jms-bridge/readme.html | 4 +-
examples/jms/jms-completion-listener/pom.xml | 2 +-
examples/jms/jms-context/pom.xml | 2 +-
examples/jms/jms-shared-consumer/pom.xml | 2 +-
examples/jms/jmx/pom.xml | 2 +-
examples/jms/large-message/pom.xml | 4 +-
examples/jms/large-message/readme.html | 2 +-
examples/jms/last-value-queue/pom.xml | 2 +-
examples/jms/last-value-queue/readme.html | 2 +-
examples/jms/management-notifications/pom.xml | 2 +-
.../jms/management-notifications/readme.html | 6 +-
.../hornetq/server0/activemq-users.xml | 2 +-
examples/jms/management/pom.xml | 2 +-
examples/jms/management/readme.html | 12 +--
.../hornetq/server0/activemq-configuration.xml | 4 +-
examples/jms/message-counters/pom.xml | 2 +-
examples/jms/message-counters/readme.html | 2 +-
examples/jms/message-group/pom.xml | 2 +-
examples/jms/message-group/readme.html | 2 +-
examples/jms/message-group2/pom.xml | 2 +-
examples/jms/message-group2/readme.html | 2 +-
examples/jms/message-priority/pom.xml | 2 +-
examples/jms/multiple-failover-failback/pom.xml | 14 ++--
.../hornetq/server0/activemq-configuration.xml | 2 +-
.../hornetq/server1/activemq-configuration.xml | 2 +-
.../hornetq/server2/activemq-configuration.xml | 2 +-
examples/jms/multiple-failover/pom.xml | 14 ++--
.../hornetq/server0/activemq-configuration.xml | 2 +-
.../hornetq/server1/activemq-configuration.xml | 2 +-
.../hornetq/server2/activemq-configuration.xml | 2 +-
examples/jms/no-consumer-buffering/pom.xml | 2 +-
examples/jms/no-consumer-buffering/readme.html | 4 +-
examples/jms/non-transaction-failover/pom.xml | 10 +--
examples/jms/openwire/pom.xml | 2 +-
examples/jms/paging/pom.xml | 2 +-
examples/jms/paging/readme.html | 4 +-
examples/jms/perf/pom.xml | 4 +-
.../hornetq/server0/activemq-configuration.xml | 2 +-
.../hornetq-configuration-messaging-lab.xml | 8 +-
examples/jms/pre-acknowledge/pom.xml | 2 +-
.../hornetq/server0/activemq-configuration.xml | 2 +-
examples/jms/producer-rate-limit/pom.xml | 2 +-
examples/jms/producer-rate-limit/readme.html | 4 +-
examples/jms/proton-cpp/pom.xml | 4 +-
examples/jms/proton-cpp/readme.html | 2 +-
examples/jms/proton-j/pom.xml | 2 +-
examples/jms/proton-j/readme.html | 2 +-
examples/jms/proton-ruby/pom.xml | 2 +-
.../jms/queue-message-redistribution/pom.xml | 10 +--
.../queue-message-redistribution/readme.html | 4 +-
examples/jms/queue-requestor/pom.xml | 2 +-
examples/jms/queue-selector/pom.xml | 2 +-
examples/jms/queue/pom.xml | 2 +-
examples/jms/reattach-node/pom.xml | 6 +-
examples/jms/reattach-node/readme.html | 2 +-
.../hornetq/server0/activemq-configuration.xml | 2 +-
examples/jms/replicated-failback-static/pom.xml | 10 +--
.../hornetq/server0/activemq-configuration.xml | 2 +-
.../hornetq/server1/activemq-configuration.xml | 2 +-
examples/jms/replicated-failback/pom.xml | 10 +--
.../hornetq/server0/activemq-configuration.xml | 2 +-
.../hornetq/server1/activemq-configuration.xml | 2 +-
.../jms/replicated-multiple-failover/pom.xml | 14 ++--
.../hornetq/server0/activemq-configuration.xml | 2 +-
.../hornetq/server1/activemq-configuration.xml | 2 +-
.../hornetq/server2/activemq-configuration.xml | 2 +-
.../jms/replicated-transaction-failover/pom.xml | 10 +--
examples/jms/request-reply/pom.xml | 2 +-
examples/jms/rest/dup-send/README.txt | 2 +-
.../dup-send/src/main/webapp/WEB-INF/web.xml | 2 +-
examples/jms/rest/jms-to-rest/receiveOrder.py | 2 +-
examples/jms/scale-down/pom.xml | 10 +--
.../hornetq/server0/activemq-configuration.xml | 4 +-
examples/jms/scheduled-message/pom.xml | 2 +-
examples/jms/security/pom.xml | 2 +-
examples/jms/security/readme.html | 12 +--
.../hornetq/server0/activemq-users.xml | 2 +-
examples/jms/send-acknowledgements/pom.xml | 2 +-
examples/jms/spring-integration/pom.xml | 2 +-
examples/jms/ssl-enabled/pom.xml | 2 +-
examples/jms/ssl-enabled/readme.html | 30 ++++----
.../hornetq/server0/activemq-configuration.xml | 4 +-
examples/jms/static-selector-jms/pom.xml | 2 +-
examples/jms/static-selector-jms/readme.html | 2 +-
examples/jms/static-selector/pom.xml | 2 +-
examples/jms/static-selector/readme.html | 2 +-
examples/jms/stomp-websockets/pom.xml | 6 +-
examples/jms/stomp/pom.xml | 2 +-
examples/jms/stomp1.1/pom.xml | 2 +-
examples/jms/stomp1.2/pom.xml | 2 +-
examples/jms/stop-server-failover/pom.xml | 10 +--
.../hornetq/server0/activemq-configuration.xml | 2 +-
.../hornetq/server1/activemq-configuration.xml | 2 +-
examples/jms/symmetric-cluster/pom.xml | 26 +++----
examples/jms/symmetric-cluster/readme.html | 2 +-
examples/jms/temp-queue/pom.xml | 2 +-
examples/jms/topic-hierarchies/pom.xml | 2 +-
examples/jms/topic-hierarchies/readme.html | 2 +-
examples/jms/topic-selector-example1/pom.xml | 2 +-
examples/jms/topic-selector-example2/pom.xml | 2 +-
examples/jms/topic/pom.xml | 2 +-
examples/jms/transaction-failover/pom.xml | 10 +--
.../hornetq/server0/activemq-configuration.xml | 2 +-
.../hornetq/server1/activemq-configuration.xml | 2 +-
examples/jms/transactional/pom.xml | 2 +-
examples/jms/xa-heuristic/pom.xml | 2 +-
examples/jms/xa-receive/pom.xml | 2 +-
examples/jms/xa-send/pom.xml | 2 +-
examples/jms/xa-with-jta/pom.xml | 2 +-
examples/soak/normal/README | 6 +-
.../normal/server0/activemq-configuration.xml | 2 +-
hornetq_doap.rdf | 2 +-
.../activemq-aerogear-integration/pom.xml | 2 +-
.../activemq-jboss-as-integration/pom.xml | 2 +-
integration/activemq-spring-integration/pom.xml | 2 +-
.../activemq-twitter-integration/pom.xml | 2 +-
integration/activemq-vertx-integration/pom.xml | 2 +-
pom.xml | 25 +++---
scripts/replace-wildfly.sh | 34 ---------
tests/byteman-tests/pom.xml | 2 +-
tests/concurrent-tests/pom.xml | 2 +-
tests/config/logging.properties | 2 +-
tests/config/logging.properties.trace | 2 +-
.../config/server-start-stop-backup-config1.xml | 2 +-
tests/config/server-start-stop-live-config1.xml | 2 +-
tests/integration-tests/pom.xml | 2 +-
.../colocated-server-start-stop-config1.xml | 16 ++--
.../colocated-server-start-stop-config2.xml | 16 ++--
.../resources/restricted-security-client.policy | 4 +-
.../resources/server-start-stop-config1.xml | 2 +-
.../src/test/resources/spring-jms-beans.xml | 4 +-
tests/jms-tests/pom.xml | 2 +-
tests/joram-tests/pom.xml | 2 +-
.../org/apache/activemq/jms/ActiveMQQAdmin.java | 2 +-
tests/performance-tests/pom.xml | 2 +-
tests/pom.xml | 2 +-
tests/soak-tests/pom.xml | 2 +-
tests/stress-tests/pom.xml | 2 +-
tests/timing-tests/pom.xml | 2 +-
tests/unit-tests/pom.xml | 2 +-
307 files changed, 840 insertions(+), 869 deletions(-)
----------------------------------------------------------------------