This closes #13 Server Load Balancing
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4b5bf5cc Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4b5bf5cc Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4b5bf5cc Branch: refs/heads/master Commit: 4b5bf5cc5de4374f6d06e20e41b24ec531329c1b Parents: 43470f3 20326d0 Author: Clebert Suconic <clebertsuco...@apache.org> Authored: Wed Jun 3 19:29:45 2015 -0400 Committer: Clebert Suconic <clebertsuco...@apache.org> Committed: Wed Jun 3 19:29:45 2015 -0400 ---------------------------------------------------------------------- .../config/ActiveMQDefaultConfiguration.java | 13 +- .../management/ClusterConnectionControl.java | 2 +- .../config/ClusterConnectionConfiguration.java | 24 +-- .../artemis/core/config/impl/Validators.java | 17 +- .../deployers/impl/FileConfigurationParser.java | 51 ++++-- .../impl/ClusterConnectionControlImpl.java | 4 +- .../artemis/core/postoffice/Bindings.java | 3 +- .../core/postoffice/impl/BindingsImpl.java | 18 +- .../core/server/ActiveMQMessageBundle.java | 3 + .../core/server/cluster/ClusterManager.java | 4 +- .../cluster/impl/ClusterConnectionImpl.java | 12 +- .../cluster/impl/MessageLoadBalancingType.java | 34 ++++ .../resources/schema/artemis-configuration.xsd | 18 +- .../core/config/impl/FileConfigurationTest.java | 5 +- .../artemis/tests/util/ActiveMQTestBase.java | 3 +- .../resources/ConfigurationTest-full-config.xml | 112 ++++++------ .../resources/InvalidConfigurationTest0.xml | 166 +++++++++--------- .../resources/InvalidConfigurationTest1.xml | 166 +++++++++--------- .../resources/InvalidConfigurationTest2.xml | 166 +++++++++--------- .../resources/InvalidConfigurationTest3.xml | 164 +++++++++--------- .../resources/InvalidConfigurationTest4.xml | 164 +++++++++--------- .../resources/InvalidConfigurationTest5.xml | 170 +++++++++---------- docs/user-manual/en/clusters.md | 49 +++--- docs/user-manual/en/configuration-index.md | 2 +- .../clustered-durable-subscription/readme.html | 44 ++--- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server1/broker.xml | 2 +- examples/jms/clustered-grouping/readme.html | 8 +- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server1/broker.xml | 2 +- .../main/resources/activemq/server2/broker.xml | 2 +- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server1/broker.xml | 2 +- examples/jms/clustered-queue/readme.html | 30 ++-- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server1/broker.xml | 2 +- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server1/broker.xml | 2 +- .../main/resources/activemq/server2/broker.xml | 2 +- .../jms/clustered-static-discovery/readme.html | 30 ++-- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server1/broker.xml | 2 +- .../main/resources/activemq/server2/broker.xml | 2 +- .../main/resources/activemq/server3/broker.xml | 2 +- .../jms/clustered-static-oneway/readme.html | 24 +-- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server1/broker.xml | 2 +- .../main/resources/activemq/server2/broker.xml | 2 +- examples/jms/clustered-topic/readme.html | 30 ++-- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server1/broker.xml | 2 +- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server1/broker.xml | 2 +- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server1/broker.xml | 2 +- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server1/broker.xml | 2 +- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server1/broker.xml | 2 +- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server1/broker.xml | 2 +- examples/jms/symmetric-cluster/readme.html | 30 ++-- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server1/broker.xml | 2 +- .../main/resources/activemq/server2/broker.xml | 2 +- .../main/resources/activemq/server3/broker.xml | 2 +- .../main/resources/activemq/server4/broker.xml | 2 +- .../main/resources/activemq/server5/broker.xml | 2 +- .../extras/byteman/ClusteredGroupingTest.java | 25 +-- .../extras/byteman/ScaleDownFailoverTest.java | 7 +- .../extras/byteman/ScaleDownFailureTest.java | 5 +- .../cluster/ClusterControllerTest.java | 5 +- .../distribution/ClusterHeadersRemovedTest.java | 5 +- .../cluster/distribution/ClusterTestBase.java | 29 ++-- .../distribution/ClusterWithBackupTest.java | 17 +- .../distribution/ClusteredGroupingTest.java | 121 ++++++------- .../ClusteredRequestResponseTest.java | 15 +- .../distribution/MessageLoadBalancingTest.java | 128 ++++++++++++++ .../distribution/MessageRedistributionTest.java | 47 ++--- .../MessageRedistributionWithDiscoveryTest.java | 15 +- .../distribution/OneWayChainClusterTest.java | 91 +++++----- .../distribution/OnewayTwoNodeClusterTest.java | 25 +-- .../SimpleSymmetricClusterTest.java | 45 ++--- .../distribution/SymmetricClusterTest.java | 39 ++--- .../SymmetricClusterWithBackupTest.java | 23 +-- .../SymmetricClusterWithDiscoveryTest.java | 15 +- .../distribution/TemporaryQueueClusterTest.java | 9 +- .../distribution/TwoWayTwoNodeClusterTest.java | 5 +- .../TwoWayTwoNodeClusterWithDiscoveryTest.java | 6 +- .../ClusterWithBackupFailoverTestBase.java | 5 +- .../DiscoveryClusterWithBackupFailoverTest.java | 16 +- .../failover/GroupingFailoverTestBase.java | 13 +- .../failover/ReplicatedDistributionTest.java | 7 +- .../StaticClusterWithBackupFailoverTest.java | 16 +- .../ha/HAAutomaticBackupSharedStore.java | 7 +- .../cluster/restart/ClusterRestartTest.java | 9 +- .../cluster/topology/HAClientTopologyTest.java | 15 +- .../HAClientTopologyWithDiscoveryTest.java | 15 +- .../cluster/topology/IsolatedTopologyTest.java | 5 + .../cluster/topology/NonHATopologyTest.java | 2 + .../cluster/util/MultiServerTestBase.java | 3 + .../ClusterConnectionControl2Test.java | 3 +- .../ClusterConnectionControlTest.java | 15 +- .../ClusterConnectionControlUsingCoreTest.java | 4 +- .../paging/SpawnedServerSupport.java | 3 +- .../integration/server/ScaleDown3NodeTest.java | 7 +- .../tests/integration/server/ScaleDownTest.java | 5 +- .../tests/util/JMSClusteredTestBase.java | 9 +- .../impl/WildcardAddressManagerUnitTest.java | 3 +- 109 files changed, 1389 insertions(+), 1090 deletions(-) ----------------------------------------------------------------------
