From commits-return-50696-archive-asf-public=cust-asf.ponee.io@activemq.apache.org Fri Mar 2 18:46:47 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0448218062F for ; Fri, 2 Mar 2018 18:46:46 +0100 (CET) Received: (qmail 47670 invoked by uid 500); 2 Mar 2018 17:46:46 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 47661 invoked by uid 99); 2 Mar 2018 17:46:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2018 17:46:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 48B95F4DC1; Fri, 2 Mar 2018 17:46:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tabish@apache.org To: commits@activemq.apache.org Date: Fri, 02 Mar 2018 17:46:44 -0000 Message-Id: <5b8ad2de14234fca8ea8771ad32f10be@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] activemq-artemis git commit: ARTEMIS-1696 doc updates Repository: activemq-artemis Updated Branches: refs/heads/master ccac4cd0d -> f97d0e001 ARTEMIS-1696 doc updates Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c1b4253b Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c1b4253b Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c1b4253b Branch: refs/heads/master Commit: c1b4253ba1b6b3614a9b5cca8b136381eb049861 Parents: ccac4cd Author: Justin Bertram Authored: Thu Feb 22 10:15:52 2018 -0600 Committer: Timothy Bish Committed: Fri Mar 2 12:45:28 2018 -0500 ---------------------------------------------------------------------- docs/user-manual/en/clusters.md | 10 ++++------ docs/user-manual/en/message-grouping.md | 29 +++++++++++++++------------- 2 files changed, 20 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c1b4253b/docs/user-manual/en/clusters.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/clusters.md b/docs/user-manual/en/clusters.md index a248b99..65ac15d 100644 --- a/docs/user-manual/en/clusters.md +++ b/docs/user-manual/en/clusters.md @@ -479,12 +479,12 @@ In the above cluster connection all parameters have been explicitly specified. The following shows all the available configuration options - `address` Each cluster connection only applies to addresses that - match the specified address field. An address is matched on the + match the specified `address` field. An address is matched on the cluster connection when it begins with the string specified in this - field. The address field on a cluster connection also supports comma - separated lists and an exclude syntax '!'. To prevent an address + field. The `address` field on a cluster connection also supports comma + separated lists and an exclude syntax `!`. To prevent an address from being matched on this cluster connection, prepend a cluster - connection address string with '!'. + connection address string with `!`. In the case shown above the cluster connection will load balance messages sent to all addresses (since it's empty). @@ -522,8 +522,6 @@ specified. The following shows all the available configuration options - Address matching on cluster connections does not support wild-card matching. - This parameter is mandatory. - - `connector-ref`. This is the connector which will be sent to other nodes in the cluster so they have the correct cluster topology. http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c1b4253b/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 2b65ae6..1d4bcd2 100644 --- a/docs/user-manual/en/message-grouping.md +++ b/docs/user-manual/en/message-grouping.md @@ -99,13 +99,8 @@ have its own grouping handler and when a messages is sent with a group id assigned, the handlers will decide between them which route the message should take. -There are 2 types of handlers; Local and Remote. Each cluster should -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 *broker.xml* -file. +Here is a sample config for each type of handler. This should be +configured in `broker.xml`. LOCAL @@ -118,12 +113,20 @@ file.
jms
5000 - -The *address* attribute refers to a [cluster connection and the address -it uses](clusters.md#configuring-cluster-connections), refer to the clustering section on how to -configure clusters. The *timeout* attribute referees to how long to wait -for a decision to be made, an exception will be thrown during the send -if this timeout is reached, this ensures that strict ordering is kept. + + - `type` two types of handlers are supported - `LOCAL` and `REMOTE`. + Each cluster should 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. + + - `address` refers to a [cluster connection and the address + it uses](clusters.md#configuring-cluster-connections). Refer to the + clustering section on how to configure clusters. + + - `timeout` how long to wait for a decision to be made. An exception + will be thrown during the send if this timeout is reached, this + ensures that strict ordering is kept. The decision as to where a message should be routed to is initially proposed by the node that receives the message. The node will pick a