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 2015/02/25 14:30:57 UTC
[8/8] activemq-6 git commit: merge #110 - Distribution config
merge #110 - Distribution config
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/e52622cf
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/e52622cf
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/e52622cf
Branch: refs/heads/master
Commit: e52622cffac2eca0a41a2d4d6c3e4a708fb2a04b
Parents: 3233371 e194b78
Author: Andy Taylor <an...@gmail.com>
Authored: Wed Feb 25 13:29:15 2015 +0000
Committer: Andy Taylor <an...@gmail.com>
Committed: Wed Feb 25 13:29:15 2015 +0000
----------------------------------------------------------------------
.../apache/activemq/utils/uri/URIFactory.java | 4 +--
.../api/core/TransportConfiguration.java | 2 +-
.../remoting/impl/netty/TransportConstants.java | 2 +-
.../activemq/uri/TCPServerLocatorSchema.java | 2 +-
.../activemq/uri/ConnectionFactoryURITest.java | 12 +++----
.../rest/queue/push/xml/XmlHttpHeader.java | 2 +-
.../impl/FileConfigurationParserTest.java | 2 +-
.../WrongRoleFileConfigurationParserTest.java | 2 +-
.../resources/ConfigurationTest-full-config.xml | 2 +-
.../resources/InvalidConfigurationTest0.xml | 4 +--
.../resources/InvalidConfigurationTest1.xml | 4 +--
.../resources/InvalidConfigurationTest2.xml | 4 +--
.../resources/InvalidConfigurationTest3.xml | 4 +--
.../resources/InvalidConfigurationTest4.xml | 4 +--
.../resources/InvalidConfigurationTest5.xml | 4 +--
.../resources/divertRoutingNameNotRequired.xml | 6 ++--
.../xa/recovery/ActiveMQXAResourceRecovery.java | 4 +--
.../activemq/src/main/resources/bin/activemq | 4 +--
.../src/main/resources/bin/activemq.conf | 34 ++++++++++++++++++++
.../config/clustered/activemq-configuration.xml | 21 ++++++++----
.../resources/config/clustered/bootstrap.xml | 10 +++---
.../non-clustered/activemq-configuration.xml | 17 +++++++---
.../replicated/activemq-configuration.xml | 21 ++++++++----
.../resources/config/replicated/bootstrap.xml | 10 +++---
.../shared-store/activemq-configuration.xml | 21 ++++++++----
.../resources/config/shared-store/bootstrap.xml | 10 +++---
docs/quickstart-guide/en/examples.md | 4 +--
docs/quickstart-guide/en/running.md | 4 +--
docs/user-manual/en/client-reconnection.md | 2 +-
docs/user-manual/en/clusters.md | 12 +++----
docs/user-manual/en/configuring-transports.md | 20 ++++++------
docs/user-manual/en/flow-control.md | 8 ++---
docs/user-manual/en/ha.md | 2 +-
docs/user-manual/en/large-messages.md | 4 +--
docs/user-manual/en/message-grouping.md | 4 +--
docs/user-manual/en/pre-acknowledge.md | 2 +-
docs/user-manual/en/thread-pooling.md | 2 +-
docs/user-manual/en/tools.md | 2 +-
docs/user-manual/en/using-jms.md | 16 ++++-----
docs/user-manual/en/using-server.md | 4 +--
.../core/example/EmbeddedRemoteExample.java | 2 +-
.../activemq/core/example/EmbeddedServer.java | 2 +-
examples/core/perf/perf.properties | 2 +-
.../server0/activemq-configuration.xml | 2 +-
.../hornetq-configuration-messaging-lab.xml | 2 +-
.../server0/activemq-configuration.xml | 4 +--
.../common/example/ActiveMQExample.java | 6 ++--
.../activemq-ra-rar/src/main/resources/ra.xml | 2 +-
examples/jms/aerogear/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../aerogear/src/main/resources/jndi.properties | 2 +-
examples/jms/applet/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
examples/jms/application-layer-failover/pom.xml | 4 +--
.../ApplicationLayerFailoverExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../activemq/server1/activemq-configuration.xml | 2 +-
examples/jms/bridge/pom.xml | 4 +--
.../activemq/jms/example/BridgeExample.java | 4 +--
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 2 +-
examples/jms/browser/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../browser/src/main/resources/jndi.properties | 2 +-
examples/jms/client-kickoff/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
.../activemq/server2/activemq-configuration.xml | 4 +--
.../jms/clustered-durable-subscription/pom.xml | 4 +--
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
examples/jms/clustered-grouping/pom.xml | 6 ++--
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
.../activemq/server2/activemq-configuration.xml | 4 +--
examples/jms/clustered-jgroups/pom.xml | 4 +--
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server0/client-jndi.properties | 2 +-
.../activemq/server1/activemq-configuration.xml | 4 +--
.../activemq/server1/client-jndi.properties | 2 +-
examples/jms/clustered-queue/pom.xml | 4 +--
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
examples/jms/clustered-standalone/pom.xml | 6 ++--
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
.../activemq/server2/activemq-configuration.xml | 4 +--
examples/jms/clustered-static-discovery/pom.xml | 8 ++---
.../activemq/server0/activemq-configuration.xml | 6 ++--
.../activemq/server1/activemq-configuration.xml | 6 ++--
.../activemq/server2/activemq-configuration.xml | 6 ++--
.../activemq/server3/activemq-configuration.xml | 6 ++--
examples/jms/clustered-static-oneway/pom.xml | 6 ++--
.../activemq/server0/activemq-configuration.xml | 6 ++--
.../activemq/server1/activemq-configuration.xml | 6 ++--
.../activemq/server2/activemq-configuration.xml | 4 +--
examples/jms/clustered-topic/pom.xml | 4 +--
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
.../jms/colocated-failover-scale-down/pom.xml | 4 +--
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
examples/jms/colocated-failover/pom.xml | 4 +--
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
examples/jms/consumer-rate-limit/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/dead-letter/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/delayed-redelivery/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/divert/pom.xml | 4 +--
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 2 +-
examples/jms/durable-subscription/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/embedded-simple/pom.xml | 4 +--
examples/jms/embedded/pom.xml | 4 +--
examples/jms/expiry/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../expiry/src/main/resources/jndi.properties | 2 +-
examples/jms/ha-policy-autobackup/pom.xml | 4 +--
.../activemq/server0/activemq-configuration.xml | 6 ++--
.../activemq/server1/activemq-configuration.xml | 6 ++--
examples/jms/http-transport/pom.xml | 2 +-
.../jms/instantiate-connection-factory/pom.xml | 2 +-
.../instantiate-connection-factory/readme.html | 4 +--
.../InstantiateConnectionFactoryExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
examples/jms/interceptor/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/jms-bridge/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/jms-shared-consumer/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../jms/jmx/src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
.../activemq/server2/activemq-configuration.xml | 4 +--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
.../activemq/server2/activemq-configuration.xml | 4 +--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server0/activemq-configuration.xml | 4 +--
.../paging/src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../jms/perf/src/main/resources/jndi.properties | 2 +-
examples/jms/pre-acknowledge/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/proton-cpp/readme.html | 4 +--
examples/jms/proton-cpp/src/main/cpp/hello.cpp | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
examples/jms/proton-j/pom.xml | 2 +-
examples/jms/proton-j/readme.html | 2 +-
.../jms/queue-message-redistribution/pom.xml | 4 +--
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../queue/src/main/resources/jndi.properties | 2 +-
.../activemq/jms/example/ReattachExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 8 ++---
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 6 ++--
.../activemq/server1/activemq-configuration.xml | 6 ++--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 6 ++--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
.../activemq/server2/activemq-configuration.xml | 4 +--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../src/main/resources/activemq-client.xml | 2 +-
.../main/resources/activemq-configuration.xml | 2 +-
.../src/main/resources/activemq-client.xml | 2 +-
.../main/resources/activemq-configuration.xml | 2 +-
.../push/src/main/resources/activemq-client.xml | 2 +-
.../main/resources/activemq-configuration.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 6 ++--
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../security/src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/static-selector-jms/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/stomp-websockets/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../stomp/src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../stomp1.1/src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../stomp1.2/src/main/resources/jndi.properties | 2 +-
examples/jms/stop-server-failover/pom.xml | 4 +--
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
.../src/main/resources/jndi.properties | 2 +-
examples/jms/symmetric-cluster/pom.xml | 10 +++---
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
.../activemq/server2/activemq-configuration.xml | 4 +--
.../activemq/server3/activemq-configuration.xml | 4 +--
.../activemq/server4/activemq-configuration.xml | 4 +--
.../activemq/server0/activemq-configuration.xml | 4 +--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/topic/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../topic/src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 +--
.../activemq/server1/activemq-configuration.xml | 4 +--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 4 +--
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 4 +--
.../activemq/server0/activemq-configuration.xml | 2 +-
.../xa-send/src/main/resources/jndi.properties | 4 +--
examples/soak/normal/pom.xml | 8 ++---
.../normal/server0/activemq-configuration.xml | 4 +--
.../activemq/jms/soak/example/SoakReceiver.java | 2 +-
.../activemq/jms/soak/example/SoakSender.java | 2 +-
.../config/server-start-stop-backup-config1.xml | 4 +--
tests/config/server-start-stop-live-config1.xml | 4 +--
.../client/JmsNettyNioStressTest.java | 4 +--
.../AutomaticColocatedQuorumVoteTest.java | 24 +++++++-------
.../cluster/failover/FailoverTestBase.java | 4 +--
.../integration/jms/SimpleJNDIClientTest.java | 10 +++---
.../integration/openwire/OpenWireTestBase.java | 3 --
.../integration/ra/ResourceAdapterTest.java | 2 +-
.../integration/server/ScaleDown3NodeTest.java | 2 +-
.../tests/util/TransportConfigurationUtils.java | 4 +--
.../colocated-server-start-stop-config1.xml | 4 +--
.../resources/server-start-stop-config1.xml | 4 +--
.../test/resources/activemq-configuration.xml | 4 +--
.../org/apache/activemq/jms/ActiveMQAdmin.java | 2 +-
.../jtests/jms/framework/PTPTestCase.java | 2 +-
.../jtests/jms/framework/PubSubTestCase.java | 2 +-
.../jtests/jms/framework/UnifiedTestCase.java | 6 ++--
.../ra/ActiveMQResourceAdapterConfigTest.java | 2 +-
.../tests/unit/ra/ResourceAdapterTest.java | 12 +++----
308 files changed, 606 insertions(+), 533 deletions(-)
----------------------------------------------------------------------