activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [2/3] activemq-artemis git commit: ARTEMIS-780 Added section on latest address model
Date Thu, 09 Mar 2017 21:53:26 GMT
ARTEMIS-780 Added section on latest address model


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c971476a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c971476a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c971476a

Branch: refs/heads/master
Commit: c971476a8879e6105b56f36ba3dfa77239d68a93
Parents: d408c46
Author: Martyn Taylor <mtaylor@redhat.com>
Authored: Wed Mar 8 16:00:45 2017 +0000
Committer: Martyn Taylor <mtaylor@redhat.com>
Committed: Thu Mar 9 21:24:02 2017 +0000

----------------------------------------------------------------------
 docs/user-manual/en/SUMMARY.md                  |   1 +
 docs/user-manual/en/address-model.md            | 585 +++++++++++++++++++
 docs/user-manual/en/configuration-index.md      |  26 +-
 .../en/images/addressing-model-p2p-pubsub.png   | Bin 0 -> 73261 bytes
 .../en/images/addressing-model-p2p.png          | Bin 0 -> 45091 bytes
 .../en/images/addressing-model-p2p2.png         | Bin 0 -> 55731 bytes
 .../en/images/addressing-model-pubsub.png       | Bin 0 -> 53982 bytes
 docs/user-manual/en/queue-attributes.md         | 220 +------
 8 files changed, 600 insertions(+), 232 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c971476a/docs/user-manual/en/SUMMARY.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index f514ff7..0e2f0a0 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -7,6 +7,7 @@
 * [Messaging Concepts](messaging-concepts.md)
 * [Architecture](architecture.md)
 * [Using the Server](using-server.md)
+* [Address Model](address-model.md)
 * [Using JMS](using-jms.md)
 * [Using Core](using-core.md)
 * [Using AMQP](using-amqp.md)

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c971476a/docs/user-manual/en/address-model.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/address-model.md b/docs/user-manual/en/address-model.md
new file mode 100644
index 0000000..8de3b67
--- /dev/null
+++ b/docs/user-manual/en/address-model.md
@@ -0,0 +1,585 @@
+# Apache ActiveMQ Artemis Addressing and Queues
+
+Apache ActiveMQ Artemis has a unique addressing model that is both powerful and flexible and that offers great performance. The addressing model comprises three main concepts: addresses, queues and routing types.
+
+An address represents a messaging endpoint. Within the configuration, a typical address is given a unique name, 0 or more queues, and a routing type.
+
+A queue is associated with an address. There can be multiple queues per address. Once an incoming message is matched to an address, the message will be sent on to one or more of its queues, depending on the routing type configured. Queues can be configured to be automatically created and deleted.
+
+A routing type determines how messages are sent to the queues associated with an address. A Apache ActiveMQ Artemis address can be configured with two different routing types.
+
+Table 1. Routing Types
+
+| If you want your messages routed to…​	                                   | Use this routing type …​ |
+| :----------------------------------------------------------------------: | :---------------------: |
+| A single queue within the matching address, in a point-to-point manner.  | Anycast                 |
+| Every queue within the matching address, in a publish-subscribe manner.  | Multicast               |
+
+--------------------------------------------------------------------------------------------
+**Note:** It is possible to define more than one routing type per address, but this typically results in an anti-pattern and is therefore not recommended.  If an address does use both routing types, however, and the client does not show a preference for either one, the broker typically defaults to the anycast routing type.
+The one exception is when the client uses the MQTT protocol. In that case, the default routing type is multicast. |
+
+## Basic Address Configuration
+
+The following examples show how to configure basic point to point and publish subscribe addresses.
+
+### Point-to-Point Messaging
+
+Point-to-point messaging is a common scenario in which a message sent by a producer has only one consumer. AMQP and JMS message producers and consumers can make use of point-to-point messaging queues, for example. Define an anycast routing type for an address so that its queues receive messages in a point-to-point manner.
+
+When a message is received on an address using anycast, Apache ActiveMQ Artemis locates the queue associated with the address and routes the message to it. When consumers request to consume from the address, the broker locates the relevant queue and associates this queue with the appropriate consumers. If multiple consumers are connected to the same queue, messages are distributed amongst each consumer equally, providing the consumers are equally able to handle them.
+
+![Point to Point](images/addressing-model-p2p.png)
+Figure 1. Point to Point Messaging
+
+#### Configuring an Address to Use the Anycast Routing Type
+
+Open the file <broker-instance>/etc/broker.xml for editing.
+
+Add an address configuration element and its associated queue if they do not exist already.
+
+**Note** For normal Point to Point semantics, the queue name **MUST** match the address name.
+
+```xml
+<configuration ...>
+  <core ...>
+    ...
+    <address name="orders">
+      <anycast>
+        <queue name="orders"/>
+      </anycast>
+    </address>
+  </core>
+</configuration>
+```
+
+### Publish-Subscribe Messaging
+
+In a publish-subscribe scenario, messages are sent to every consumer subscribed to an address. JMS topics and MQTT subscriptions are two examples of publish-subscribe messaging.
+
+To configure an address with publish-subscribe semantics, create an address with the multicast routing tyoe.
+
+![Publish Subscribe](images/addressing-model-pubsub.png)
+Figure 2. Publish-Subscribe
+
+#### Configuring an Address to Use the Multicast Routing Type
+
+Open the file <broker-instance>/etc/broker.xml for editing.
+
+Add an address configuration element with multicast routing type.
+
+```xml
+<configuration ...>
+  <core ...>
+    ...
+    <address name="pubsub.foo">
+      <multicast/>
+    </address>
+  </core>
+</configuration>
+```
+
+When clients connect to an address with the multicast element, a subscription queue for the client will be automatically created for the client.  It is also possible to pre-configure subscription queues and connect to them directly using the queue's [Fully Qualified Queue names](#fully-qualified-queue-names).
+
+Add one more queue elements to the address and wrap the multicast element around them. This step is typically not needed since the broker will automatically create a queue for each subscription requested by a client.
+
+```xml
+<configuration ...>
+  <core ...>
+    ...
+    <address name="pubsub.foo">
+      <multicast>
+        <queue name="client123.pubsub.foo"/>
+        <queue name="client456.pubsub.foo"/>
+      </multicast>
+    </address>
+  </core>
+</configration>
+```
+
+Figure 3. Point-to-Point with Two Queues
+
+### Point-to-Point Address multiple Queues
+
+It is actually possible to define more than one queue on an address with an anycast routing type. When messages are received on such an address, they are firstly distributed evenly across all the defined queues. Using [Fully Qualified Queue names](#fully-qualified-queue-names)., clients are able to select the queue that they’d like to subscribe to. Should more than one consumer connect direct to a single queue, Apache ActiveMQ Artemis will take care of distributing messages between them, as in the example above.
+
+![Point to Point](images/addressing-model-p2p2.png)
+Figure 3. Point-to-Point with Two Queues
+
+--------------------------------------------------------------------------------------------
+**Note:** This is how Apache ActiveMQ Artemis handles load balancing of queues across multiple nodes in a cluster.
+Configuring a Point-to-Point Address with Two Queues
+Open the file <broker-instance>/etc/broker.xml for editing.
+
+Add an address configuration with Anycast routing type element and its associated queues.
+
+```xml
+<configuration ...>
+  <core ...>
+    ...
+    <address name="address.foo">
+      <anycast>
+        <queue name="q1"/>
+        <queue name="q2"/>
+      </anycast>
+    </address>
+  </core>
+</configuration>
+```
+
+### Point-to-Point and Publish-Subscribe Addresses
+
+It is possible to define an address with both point-to-point and publish-subscribe semantics enabled. While not typically recommend, this can be useful when you want, for example, a JMS Queue say orders and a JMS Topic named orders. The different routing types make the addresses appear to be distinct.
+
+Using an example of JMS Clients, the messages sent by a JMS queue producer will be routed using the anycast routing type. Messages sent by a JMS topic producer will use the multicast routing type. In addition when a JMS topic consumer attaches it will be attached to it’s own subscription queue. JMS queue consumer will be attached to the anycast queue.
+
+![Point to Point](images/addressing-model-p2p-pubsub.png)
+Figure 4. [Point-to-Point and Publish-Subscribe
+
+--------------------------------------------------------------------------------------------
+**Note:** The behavior in this scenario is dependent on the protocol being used. For JMS there is a clear distinction between topic and queue producers and consumers, which make the logic straight forward. Other protocols like AMQP do not make this distinction. A message being sent via AMQP will be routed by both anycast and multicast and consumers will default to anycast. For more information, please check the behavior of each protocol in the sections on protocols.
+
+The XML snippet below is an example of what the configuration for an address using both anycast and multicast would look like in <broker-instance>/etc/broker.xml. routing types. Note that subscription queues are typically created on demand, so there is no need to list specific queue elements inside the multicast routing type.
+
+```xml
+<configuration ...>
+  <core ...>
+    ...
+    <address name="foo.orders">
+      <anycast>
+        <queue name="orders"/>
+      </anycast>
+      <multicast/>
+    </address>
+  </core>
+</configuration>
+```
+
+## How to filter messages
+
+Apache ActiveMQ Artemis supports the ability to filter messages using Apache Artemis [Filter Expressions](#filter-expressions).
+
+Filters can be applied in two places, on a queue and on a consumer.
+
+### Queue Filter
+
+When a filter is applied to a queue, messages are filter before they sent to the queue.  To add a queue filter use the
+filter element when configuring a queue.  Open up the broker.xml and add an address with a queue, using the filter element
+to configure a filter on this queue.
+
+```xml
+    <address name="filter">
+       <queue name="filter">
+          <filter string="color='red'"/>
+        </queue>
+    </address>
+```
+
+The filter defined above ensures that only messages with an attribute "color='red'" is sent to this queue.
+
+### Consumer Filters
+
+Consumer filters are applied after messages have reached a queue and are defined using the appropriate client APIs.  The
+follow JMS example shows how to consumer filters work.
+
+1. Define an address with a single queue, with no filter applied.
+
+```xml
+    <address name="filter">
+       <queue name="filter">
+       </queue>
+    </address>
+```
+
+```java
+  ...
+  // Send some messages
+  for (int i = 0; i < 3; i ++) {
+    TextMessage redMessage = senderSession.createTextMessage("Red");
+    redMessage.setStringProperty("color", "red");
+    producer.send(redMessage)
+        
+    TextMessage greenMessage = senderSession.createTextMessage("Green");
+    greenMessage.setStringProperty("color", "green");
+    producer.send(greenMessage)
+  }
+```
+
+At this point the queue would have 6 messages: red,green,red,green,red,green
+         
+```java
+  MessageConsumer redConsumer = redSession.createConsumer(queue, "color='red'");
+```
+
+The redConsumer has a filter that only matches "red" messages.  The redConsumer will receive 3 messages.
+
+```
+red, red, red
+```
+
+The resulting queue would now be
+
+```
+green, green, green
+```
+
+## Creating and Deleting Addresses and Queues Automatically
+
+You can configure Apache ActiveMQ Artemis to automatically create addresses and queues, and then delete them when they are no longer in use. This saves you from having to preconfigure each address and queue before a client can connect to it. Automatic creation and deletion is configured on a per address basis and is controlled by following:
+
+| Parameter | Description |
+|-----------|-------------|
+| auto-create-addresses | When set to true, the broker will create the address requested by the client if it does not exist already. The default is true.|
+| auto-delete-addresses | When set to true, the broker will be delete any **auto-created** adddress once all of it’s queues have been deleted. The default is true |
+|default-address-routing-type | The routing type to use if the client does not specify one.   Possible values are MULTICAST and ANYCAST. See earlier in this chapter for more information about routing types. The default value is MULTICAST. |
+
+### Configuring an Address to be Automatically Created
+
+Edit the file <broker-instance>/etc/broker.xml and add the auto-create-addresses element to the address-setting you want the broker to automatically create.
+
+(Optional) Add the address-setting if it does not exits. Use the match parameter and the The Apache ActiveMQ Artemis Wildcard Syntax to match more than one specific address.
+
+Set auto-create-addresses to true
+
+(Optional) Assign MULTICAST or ANYCAST as the default routing type for the address.
+
+The example below configures an address-setting to be automatically created by the broker. The default routing type to be used if not specified by the client is MULTICAST. Note that wildcard syntax is used. Any address starting with /news/politics/ will be automatically created by the broker.
+
+```xml
+<configuration ...>
+  <core ...>
+    ...
+    <address-settings>
+       <address-setting match="/news/politics/#">
+          <auto-create-addresses>true</auto-create-addresses>
+          <default-address-routing-type>MULTICAST</default-address-routing-type>
+       </address-setting>
+    </address-settings>
+    ...
+  </core>
+</configuration>
+```
+
+### Configuring an Address to be Automatically Deleted
+
+Edit the file <broker-instance>/etc/broker.xml and add the auto-delete-addresses element to the address-setting you want the broker to automatically create.
+
+(Optional) Add the address-setting if it does not exits. Use the match parameter and the The Apache ActiveMQ Artemis Wildcard Syntax to match more than one specific address.
+
+Set auto-delete-addresses to true
+
+The example below configures an address-setting to be automatically deleted by the broker. Note that wildcard syntax is used. Any address request by the client that starts with /news/politics/ is configured to be automatically deleted by the broker.
+
+```xml
+<configuration ...>
+  <core ...>
+    ...
+    <address-settings>
+       <address-setting match="/news/politics/#">
+          <auto-create-addresses>true</auto-create-addresses>
+          <default-address-routing-type>MULTICAST</default-address-routing-type>
+       </address-setting>
+    </address-settings>
+    ...
+  </core>
+</configuration>
+```
+
+## Fully Qualified Queue Names
+
+Internally the broker maps a client’s request for an address to specific queues. The broker decides on behalf of the client which queues to send messages to or from which queue to receive messages. However, more advanced use cases might require that the client specify a queue directly. In these situations the client and use a fully qualified queue name, by specifying both the address name and the queue name, separated by a ::.
+
+### Specifying a Fully Qualified Queue Name
+In this example, the address foo is configured with two queues q1, q2 as shown in the configuration below.
+
+```xml
+<configuration ...>
+  <core ...>
+    ...
+    <addresses>
+       <address name="foo">
+          <anycast>
+             <queue name="q1" />
+             <queue name="q2" />
+          </anycast>
+       </address>
+    </addresses>
+  </core>
+</configuration>
+```
+
+In the client code, use both the address name and the queue name when requesting a connection from the broker. Remember to use two colons, ::, to separate the names, as in the example Java code below.
+
+```java
+String FQQN = "foo::q1";
+Queue q1 session.createQueue(FQQN);
+MessageConsumer consumer = session.createConsumer(q1);
+```
+
+## Configuring a Prefix to Connect to a Specific Routing Type
+
+Normally, if a Apache ActiveMQ Artemis receivs a message sent to a particular address, that has both anycast and multicast routing types enable, Apache ActiveMQ Artemis will route a copy of the message to **one** of the anycast queues and to **all** of the multicast queues.
+
+However, clients can specify a special prefix when connecting to an address to specify whether to connect using anycast or multicast. The prefixes are custom values that are designated using the anycastPrefix and multicastPrefix parameters within the URL of an acceptor.
+
+### Configuring an Anycast Prefix
+
+In <broker-instance>/etc/broker.xml, add the anycastPrefix to the URL of the desired acceptor. In the example below, the acceptor is configured to use anycast:// for the anycastPrefix. Client code can specify anycast://foo/ if the client needs to send a message to only one of the anycast queues.
+
+```xml
+<configuration ...>
+  <core ...>
+    ...
+      <acceptors>
+         <acceptor name="artemis">tcp://0.0.0.0:61616?protocols=AMQP;anycastPrefix=anycast://</acceptor>
+      </acceptors>
+    ...
+  </core>
+</configuration>
+```
+
+### Configuring a Multicast Prefix
+
+In <broker-instance>/etc/broker.xml, add the anycastPrefix to the URL of the desired acceptor. In the example below, the acceptor is configured to use multicast:// for the multicastPrefix. Client code can specify multicast://foo/ if the client needs the message sent to only the multicast queues of the address.
+
+```xml
+<configuration ...>
+  <core ...>
+    ...
+      <acceptors>
+         <acceptor name="artemis">tcp://0.0.0.0:61616?protocols=AMQP;multicastPrefix=multicast://</acceptor>
+      </acceptors>
+    ...
+  </core>
+</configuration>
+```
+
+## Advanced Address Configuration
+
+### Pre-configuring subscription queue semantics
+
+In most cases it’s not necessary to pre-create subscription queues. The relevant protocol managers take care of creating subscription queues when clients request to subscribe to an address.  The type of subscription queue created, depends on what properties the client request.  E.g. durable, non-shared, shared etc...  Protocol managers uses special queue names to identify which queues below to which consumers and users need not worry about the details.
+
+However, there are scenarios where a user may want to use broker side configuration to pre-configure a subscription.  And later connect to that queue directly using a [Fully Qualified Queue name](#fully-qualified-queue-names)..  The examples below show how to use broker side configuration to pre-configure a queue with publish subscribe behavior for shared, non-shared, durable and non-durable subscription behavior.
+
+#### Configuring a shared durable subscription queue with up to 10 concurrent consumers
+
+The default behavior for queues is to not limit the number connected queue consumers.  The **max-consumers** paramter of the queue element can be used to limit the number of connected consumers allowed at any one time.
+
+Open the file <broker-instance>/etc/broker.xml for editing.
+
+```xml
+<configuration ...>
+  <core ...>
+    ...
+    <address name="durable.foo">
+      <multicast>
+        <!-- pre-configured shared durable subscription queue -->
+        <queue name="q1" max-consumers="10">
+          <durable>true</durable>
+        </queue>
+      </multicast>
+    </address>
+  </core>
+</configuration>
+```
+
+#### Configuring a non-shared durable subscription
+
+The broker can be configured to prevent more than one consumer from connecting to a queue at any one time. The subscriptions to queues configured this way are therefore "non-shared".  To do this simply set the **max-consumers** parameter to "1"
+
+```xml
+<configuration ...>
+  <core ...>
+    ...
+    <address name="durable.foo">
+      <multicast>
+        <!-- pre-configured non shared durable subscription queue -->
+        <queue name="q1" max-consumers="1">
+          <durable>true</durable>
+        </queue>
+      </multicast>
+    </address>
+  </core>
+</configuration>
+```
+
+#### Pre-configuring a queue as a non-durable subscription queue
+
+Non-durable subscriptions are again usually managed by the relevant protocol manager, by creating and deleting temporary queues.
+
+If a user requires to pre-create a queue that behaves like a non-durable subscription queue the **purge-on-no-consumers** flag can be enabled on the queue.  When **purge-on-no-consumers** is set to **true**.  The queue will not start receiving messages until a consumer is attached.  When the last consumer is detached from the queue.  The queue is purged (it's messages are removed) and will not receive any more messages until a new consumer is attached.
+
+Open the file <broker-instance>/etc/broker.xml for editing.
+
+```xml
+<configuration ...>
+  <core ...>
+    ...
+    <address name="non.shared.durable.foo">
+      <multicast>
+        <queue name="orders1" purge-on-no-consumers="true"/>
+      </multicast>
+    </address>
+  </core>
+</configuration>
+```
+
+## Additional Information: Protocol Managers, Address
+
+A protocol manager maps protocol specific concepts down to the Apache ActiveMQ Artemis core model of addresses, queues and routing types. For example, when a client sends a MQTT subscription packet with the addresses 
+
+```
+/house/room1/lights
+/house/room2/lights
+```
+
+The MQTT protocol manager understands that the two addresses require multicast semantics. The protocol manager will therefore first look to ensure that multicast is enabled for both addresses. If not, it will attempt to dynamically create them. If successful, the protocol manager will then create special subscription queues with special names, for each subscription requested by the client.
+
+The special name allows the protocol manager to quickly identify the required client subscription queues should the client disconnect and reconnect at a later date.  If the subscription is temporary the protocol manager will delete the queue once the client disconnects.  
+
+When a client requests to subscribe to a point to point address.  The protocol manager will look up the queue associated with the point to point address.  This queue should have the same name as the addresss.
+
+**Note:** If the queue is auto created, it will be auto deleted once there are no consumers and no messages in it.  For more information on auto create see the next section [Configuring Addresses and Queues via Address Settings](#Configuring-Addresses-and-Queues-via-Address-Settings)
+
+## Configuring Addresses and Queues via Address Settings
+
+There are some attributes that are defined against an address wildcard
+rather than a specific address/queue. Here an example of an `address-setting`
+entry that would be found in the `broker.xml` file.
+
+    <address-settings>
+       <address-setting match="order.foo">
+          <dead-letter-address>DLA</dead-letter-address>
+          <max-delivery-attempts>3</max-delivery-attempts>
+          <redelivery-delay>5000</redelivery-delay>
+          <expiry-address>ExpiryQueue</expiry-address>
+          <last-value-queue>true</last-value-queue>
+          <max-size-bytes>100000</max-size-bytes>
+          <page-size-bytes>20000</page-size-bytes>
+          <redistribution-delay>0</redistribution-delay>
+          <send-to-dla-on-no-route>true</send-to-dla-on-no-route>
+          <address-full-policy>PAGE</address-full-policy>
+          <slow-consumer-threshold>-1</slow-consumer-threshold>
+          <slow-consumer-policy>NOTIFY</slow-consumer-policy>
+          <slow-consumer-check-period>5</slow-consumer-check-period>
+       </address-setting>
+    </address-settings>
+
+The idea with address settings, is you can provide a block of settings
+which will be applied against any addresses that match the string in the
+`match` attribute. In the above example the settings would only be
+applied to the address "order.foo" address but you can also use wildcards
+to apply settings.  See: [The chapter on the wild card syntax](#wildcard-syntax).
+
+For example, if you used the `match` string `jms.queue.#` the settings
+would be applied to all addresses which start with `jms.queue.` which
+would be all JMS queues.
+
+The meaning of the specific settings are explained fully throughout the
+user manual, however here is a brief description with a link to the
+appropriate chapter if available.
+
+`max-delivery-attempts` defines how many time a cancelled message can be
+redelivered before sending to the `dead-letter-address`. A full
+explanation can be found [here](#undelivered-messages.configuring).
+
+`redelivery-delay` defines how long to wait before attempting redelivery
+of a cancelled message. see [here](#undelivered-messages.delay).
+
+`expiry-address` defines where to send a message that has expired. see
+[here](#message-expiry.configuring).
+
+`expiry-delay` defines the expiration time that will be used for
+messages which are using the default expiration time (i.e. 0). For
+example, if `expiry-delay` is set to "10" and a message which is using
+the default expiration time (i.e. 0) arrives then its expiration time of
+"0" will be changed to "10." However, if a message which is using an
+expiration time of "20" arrives then its expiration time will remain
+unchanged. Setting `expiry-delay` to "-1" will disable this feature. The
+default is "-1".
+
+`last-value-queue` defines whether a queue only uses last values or not.
+see [here](#last-value-queues).
+
+`max-size-bytes` and `page-size-bytes` are used to set paging on an
+address. This is explained [here](#paging).
+
+`redistribution-delay` defines how long to wait when the last consumer
+is closed on a queue before redistributing any messages. see
+[here](#clusters).
+
+`send-to-dla-on-no-route`. If a message is sent to an address, but the
+server does not route it to any queues, for example, there might be no
+queues bound to that address, or none of the queues have filters that
+match, then normally that message would be discarded. However if this
+parameter is set to true for that address, if the message is not routed
+to any queues it will instead be sent to the dead letter address (DLA)
+for that address, if it exists.
+
+`address-full-policy`. This attribute can have one of the following
+values: PAGE, DROP, FAIL or BLOCK and determines what happens when an
+address where `max-size-bytes` is specified becomes full. The default
+value is PAGE. If the value is PAGE then further messages will be paged
+to disk. If the value is DROP then further messages will be silently
+dropped. If the value is FAIL then further messages will be dropped and
+an exception will be thrown on the client-side. If the value is BLOCK
+then client message producers will block when they try and send further
+messages. See the following chapters for more info [Flow Control](flow-control.md), [Paging](paging.md).
+
+`slow-consumer-threshold`. The minimum rate of message consumption
+allowed before a consumer is considered "slow." Measured in
+messages-per-second. Default is -1 (i.e. disabled); any other valid
+value must be greater than 0.
+
+`slow-consumer-policy`. What should happen when a slow consumer is
+detected. `KILL` will kill the consumer's connection (which will
+obviously impact any other client threads using that same connection).
+`NOTIFY` will send a CONSUMER\_SLOW management notification which an
+application could receive and take action with. See [slow consumers](slow-consumers.md) for more details
+on this notification.
+
+`slow-consumer-check-period`. How often to check for slow consumers on a
+particular queue. Measured in seconds. Default is 5. See [slow consumers](slow-consumers.md)
+for more information about slow consumer detection.
+
+`auto-create-jms-queues`. Whether or not the broker should automatically
+create a JMS queue when a JMS message is sent to a queue whose name fits
+the address `match` (remember, a JMS queue is just a core queue which has
+the same address and queue name) or a JMS consumer tries to connect to a
+queue whose name fits the address `match`. Queues which are auto-created
+are durable, non-temporary, and non-transient. Default is `true`. This is
+_DEPRECATED_.  See `auto-create-queues`.
+
+`auto-delete-jms-queues`. Whether or not the broker should automatically
+delete auto-created JMS queues when they have both 0 consumers and 0 messages.
+Default is `true`. This is _DEPRECATED_.  See `auto-delete-queues`.
+
+`auto-create-jms-topics`. Whether or not the broker should automatically
+create a JMS topic when a JMS message is sent to a topic whose name fits
+the address `match` (remember, a JMS topic is just a core address which has 
+one or more core queues mapped to it) or a JMS consumer tries to subscribe
+to a topic whose name fits the address `match`. Default is `true`. This is
+_DEPRECATED_.  See `auto-create-addresses`.
+
+`auto-delete-jms-topics`. Whether or not the broker should automatically
+delete auto-created JMS topics once the last subscription on the topic has
+been closed. Default is `true`. This is _DEPRECATED_.  See `auto-delete-addresses`.
+
+`auto-create-queues`. Whether or not the broker should automatically
+create a queue when a message is sent or a consumer tries to connect to a
+queue whose name fits the address `match`. Queues which are auto-created
+are durable, non-temporary, and non-transient. Default is `true`.
+
+`auto-delete-queues`. Whether or not the broker should automatically
+delete auto-created queues when they have both 0 consumers and 0 messages.
+Default is `true`.
+
+`auto-create-addresses`. Whether or not the broker should automatically
+create an address when a message is sent to or a consumer tries to consume
+from a queue which is mapped to an address whose name fits the address `match`.
+Default is `true`.
+
+`auto-delete-addresses`. Whether or not the broker should automatically
+delete auto-created addresses once the address no longer has any queues.
+Default is `true`.

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c971476a/docs/user-manual/en/configuration-index.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/configuration-index.md b/docs/user-manual/en/configuration-index.md
index cffee06..955c87b 100644
--- a/docs/user-manual/en/configuration-index.md
+++ b/docs/user-manual/en/configuration-index.md
@@ -42,7 +42,7 @@ Name | Description
 :--- | :---
 [acceptors](configuring-transports.md "Understanding Acceptors") | a list of remoting acceptors
 [acceptors.acceptor](configuring-transports.md "Understanding Acceptors") | Each acceptor is composed for just an URL
-[address-settings](queue-attributes.md "Configuring Queues Via Address Settings")                                                    |  [a list of address-setting](#address-setting-type)
+[address-settings](address-model.md "Configuring Addresses and Queues Via Address Settings")                                                    |  [a list of address-setting](#address-setting-type)
 [allow-failback](ha.md "Failing Back to live Server")                                                                              |  Should stop backup on live restart. default true
 [async-connection-execution-enabled](connection-ttl.md "Configuring Asynchronous Connection Execution")  | If False delivery would be always asynchronous. default true
 [bindings-directory](persistence.md "Configuring the bindings journal")  | The folder in use for the bindings folder
@@ -99,7 +99,7 @@ Name | Description
 [persist-delivery-count-before-delivery](undelivered-messages.md "Delivery Count Persistence")  |  True means that the delivery count is persisted before delivery. False means that this only happens after a message has been cancelled. Default=false
 [persistence-enabled](persistence.md "Configuring ActiveMQ Artemis for Zero Persistence")               |  true means that the server will use the file based journal for persistence. Default=true
 [persist-id-cache](duplicate-detection.md "Configuring the Duplicate ID Cache")                 |  true means that ID's are persisted to the journal. Default=true
-[queues](queue-attributes.md "Predefined Queues")       |  [a list of queue to be created](#queue-type)
+[queues](address-model.md "Predefined Queues")       |  [a list of queue to be created](#queue-type)
 [remoting-incoming-interceptors](intercepting-operations.md "Intercepting Operations")                                                   |  A list of interceptor
 [resolveProtocols]()  |  Use [ServiceLoader](http://docs.oracle.com/javase/tutorial/ext/basics/spi.html) to load protocol modules. Default=true
 [scheduled-thread-pool-max-size](thread-pooling.md#server.scheduled.thread.pool "Server Scheduled Thread Pool")|  Maximum number of threads to use for the scheduled thread pool. Default=5
@@ -122,22 +122,22 @@ system-property-prefix | Prefix for replacing configuration settings using Bean
 
 Name | Description
 :--- | :---
-[match ](queue-attributes.md "Configuring Queues Via Address Settings")         | The filter to apply to the setting
+[match ](address-model.md "Configuring Queues Via Address Settings")         | The filter to apply to the setting
 [dead-letter-address](undelivered-messages.md "Configuring Dead Letter Addresses")                |  dead letter address
 [expiry-address](message-expiry.md "Configuring Expiry Addresses")                                  |  expired messages address
-[expiry-delay](queue-attributes.md "Configuring Queues Via Address Settings")                       |  expiration time override, -1 don't override with default=-1
+[expiry-delay](address-model.md "Configuring Queues Via Address Settings")                       |  expiration time override, -1 don't override with default=-1
 [redelivery-delay](undelivered-messages.md "Configuring Delayed Redelivery")                      |  time to redeliver a message (in ms) with default=0
-[redelivery-delay-multiplier](queue-attributes.md "Configuring Queues Via Address Settings")        |  multiplier to apply to the "redelivery-delay"
-[max-redelivery-delay](queue-attributes.md "Configuring Queues Via Address Settings")               |  Max value for the redelivery-delay
+[redelivery-delay-multiplier](address-model.md "Configuring Queues Via Address Settings")        |  multiplier to apply to the "redelivery-delay"
+[max-redelivery-delay](address-model.md "Configuring Queues Via Address Settings")               |  Max value for the redelivery-delay
 [max-delivery-attempts](undelivered-messages.md "Configuring Dead Letter Addresses")              |  Number of retries before dead letter address, default=10
 [max-size-bytes](paging.md "Paging")                                                          |  Limit before paging. -1 = infinite
 [page-size-bytes](paging.md "Paging")                                                         |  Size of each file on page, default=10485760
 [page-max-cache-size](paging.md "Paging")                                                     |  Maximum number of files cached from paging default=5
-[address-full-policy](queue-attributes.md "Configuring Queues Via Address Settings")                |  Model to chose after queue full
-[message-counter-history-day-limit](queue-attributes.md "Configuring Queues Via Address Settings")  |  Days to keep in history
+[address-full-policy](address-model.md "Configuring Queues Via Address Settings")                |  Model to chose after queue full
+[message-counter-history-day-limit](address-model.md "Configuring Queues Via Address Settings")  |  Days to keep in history
 [last-value-queue](last-value-queues.md "Last-Value Queues")                                  |  Queue is a last value queue, default=false
 [redistribution-delay](clusters.md "Clusters")                                                |  Timeout before redistributing values after no consumers. default=-1
-[send-to-dla-on-no-route](queue-attributes.md "Configuring Queues Via Address Settings")            |  Forward messages to DLA when no queues subscribing. default=false
+[send-to-dla-on-no-route](address-model.md "Configuring Queues Via Address Settings")            |  Forward messages to DLA when no queues subscribing. default=false
 
 
 #bridge type
@@ -235,10 +235,10 @@ Name | Description
 
 Name | Description
 :--- | :---
-[name ](queue-attributes.md "Predefined Queues")                                                              |  unique name
-[address](queue-attributes.md "Predefined Queues")                                                                                |  address for the queue
-[filter](queue-attributes.md "Predefined Queues")                                                                                 | optional core filter expression
-[durable](queue-attributes.md "Predefined Queues")                                                                                |  whether the queue is durable (persistent). Default=true
+[name ](address-model.md "Predefined Queues")                                                              |  unique name
+[address](address-model.md "Predefined Queues")                                                                                |  address for the queue
+[filter](address-model.md "Predefined Queues")                                                                                 | optional core filter expression
+[durable](address-model.md "Predefined Queues")                                                                                |  whether the queue is durable (persistent). Default=true
 
 
 #security-setting type

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c971476a/docs/user-manual/en/images/addressing-model-p2p-pubsub.png
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/images/addressing-model-p2p-pubsub.png b/docs/user-manual/en/images/addressing-model-p2p-pubsub.png
new file mode 100644
index 0000000..81e43e7
Binary files /dev/null and b/docs/user-manual/en/images/addressing-model-p2p-pubsub.png differ

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c971476a/docs/user-manual/en/images/addressing-model-p2p.png
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/images/addressing-model-p2p.png b/docs/user-manual/en/images/addressing-model-p2p.png
new file mode 100644
index 0000000..9547ed7
Binary files /dev/null and b/docs/user-manual/en/images/addressing-model-p2p.png differ

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c971476a/docs/user-manual/en/images/addressing-model-p2p2.png
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/images/addressing-model-p2p2.png b/docs/user-manual/en/images/addressing-model-p2p2.png
new file mode 100644
index 0000000..ae13978
Binary files /dev/null and b/docs/user-manual/en/images/addressing-model-p2p2.png differ

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c971476a/docs/user-manual/en/images/addressing-model-pubsub.png
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/images/addressing-model-pubsub.png b/docs/user-manual/en/images/addressing-model-pubsub.png
new file mode 100644
index 0000000..da87371
Binary files /dev/null and b/docs/user-manual/en/images/addressing-model-pubsub.png differ

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c971476a/docs/user-manual/en/queue-attributes.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/queue-attributes.md b/docs/user-manual/en/queue-attributes.md
index 7a8fe78..156b9ba 100644
--- a/docs/user-manual/en/queue-attributes.md
+++ b/docs/user-manual/en/queue-attributes.md
@@ -1,220 +1,2 @@
-# Queue Attributes
+# Address and Queue Attributes and Settings
 
-Queue attributes can be set in one of two ways. Either by configuring
-them using the configuration file or by using the core API. This chapter
-will explain how to configure each attribute and what effect the
-attribute has.
-
-## Predefined Queues
-
-Queues can be predefined via configuration at a core level or at a JMS
-level. Firstly let's look at a JMS level.
-
-The following shows a queue predefined in the jms element of the `broker.xml`
-configuration file.
-
-    <queue name="selectorQueue">
-       <selector string="color='red'"/>
-       <durable>true</durable>
-    </queue>
-
-This name attribute of queue defines the name of the queue. When we do
-this at a jms level we follow a naming convention so the actual name of
-the core queue will be `jms.queue.selectorQueue`.
-
-The selector element defines what JMS message selector the predefined
-queue will have. Only messages that match the selector will be added to
-the queue. This is an optional element with a default of null when
-omitted.
-
-The durable element specifies whether the queue will be persisted. This
-again is optional and defaults to true if omitted.
-
-Secondly a queue can be predefined at a core level in the
-`broker.xml` file. The following is an example.
-
-    <queues>
-       <queue name="jms.queue.selectorQueue">
-          <address>jms.queue.selectorQueue</address>
-          <filter string="color='red'"/>
-          <durable>true</durable>
-        </queue>
-    </queues>
-
-This is very similar to the JMS configuration, with 3 real differences
-which are.
-
-1.  The name attribute of queue is the actual name used for the queue
-    with no naming convention as in JMS.
-
-2.  The address element defines what address is used for routing
-    messages.
-
-3.  The filter uses the *Core filter syntax* (described in [filter Expressions](filter-expressions.md)), *not* the
-    JMS selector syntax.
-
-## Using the API
-
-Queues can also be created using the core API or the management API.
-
-For the core API, queues can be created via the
-`org.apache.activemq.artemis.api.core.client.ClientSession` interface. There are
-multiple `createQueue` methods that support setting all of the
-previously mentioned attributes. There is one extra attribute that can
-be set via this API which is `temporary`. setting this to true means
-that the queue will be deleted once the session is disconnected.
-
-Take a look at [Management](management.md) for a description of the management API for creating
-queues.
-
-## Configuring Queues Via Address Settings
-
-There are some attributes that are defined against an address wildcard
-rather than a specific queue. Here an example of an `address-setting`
-entry that would be found in the `broker.xml` file.
-
-    <address-settings>
-       <address-setting match="jms.queue.exampleQueue">
-          <dead-letter-address>jms.queue.deadLetterQueue</dead-letter-address>
-          <max-delivery-attempts>3</max-delivery-attempts>
-          <redelivery-delay>5000</redelivery-delay>
-          <expiry-address>jms.queue.expiryQueue</expiry-address>
-          <last-value-queue>true</last-value-queue>
-          <max-size-bytes>100000</max-size-bytes>
-          <page-size-bytes>20000</page-size-bytes>
-          <redistribution-delay>0</redistribution-delay>
-          <send-to-dla-on-no-route>true</send-to-dla-on-no-route>
-          <address-full-policy>PAGE</address-full-policy>
-          <slow-consumer-threshold>-1</slow-consumer-threshold>
-          <slow-consumer-policy>NOTIFY</slow-consumer-policy>
-          <slow-consumer-check-period>5</slow-consumer-check-period>
-          <auto-create-jms-queues>true</auto-create-jms-queues> <!-- DEPRECATED see auto-create-queues>
-          <auto-delete-jms-queues>true</auto-delete-jms-queues> <!-- DEPRECATED see auto-delete-queues>
-          <auto-create-jms-topics>true</auto-create-jms-topics> <!-- DEPRECATED see auto-create-addresses>
-          <auto-delete-jms-topics>true</auto-delete-jms-topics> <!-- DEPRECATED see auto-delete-addresses>
-          <auto-create-jms-queues>true</auto-create-jms-queues>
-          <auto-delete-jms-queues>true</auto-delete-jms-queues>
-          <auto-create-jms-topics>true</auto-create-jms-topics>
-          <auto-delete-jms-topics>true</auto-delete-jms-topics>
-       </address-setting>
-    </address-settings>
-
-The idea with address settings, is you can provide a block of settings
-which will be applied against any addresses that match the string in the
-`match` attribute. In the above example the settings would only be
-applied to any addresses which exactly match the address
-`jms.queue.exampleQueue`, but you can also use wildcards to apply sets
-of configuration against many addresses. The wildcard syntax used is
-described [here](#wildcard-syntax).
-
-For example, if you used the `match` string `jms.queue.#` the settings
-would be applied to all addresses which start with `jms.queue.` which
-would be all JMS queues.
-
-The meaning of the specific settings are explained fully throughout the
-user manual, however here is a brief description with a link to the
-appropriate chapter if available.
-
-`max-delivery-attempts` defines how many time a cancelled message can be
-redelivered before sending to the `dead-letter-address`. A full
-explanation can be found [here](#undelivered-messages.configuring).
-
-`redelivery-delay` defines how long to wait before attempting redelivery
-of a cancelled message. see [here](#undelivered-messages.delay).
-
-`expiry-address` defines where to send a message that has expired. see
-[here](#message-expiry.configuring).
-
-`expiry-delay` defines the expiration time that will be used for
-messages which are using the default expiration time (i.e. 0). For
-example, if `expiry-delay` is set to "10" and a message which is using
-the default expiration time (i.e. 0) arrives then its expiration time of
-"0" will be changed to "10." However, if a message which is using an
-expiration time of "20" arrives then its expiration time will remain
-unchanged. Setting `expiry-delay` to "-1" will disable this feature. The
-default is "-1".
-
-`last-value-queue` defines whether a queue only uses last values or not.
-see [here](#last-value-queues).
-
-`max-size-bytes` and `page-size-bytes` are used to set paging on an
-address. This is explained [here](#paging).
-
-`redistribution-delay` defines how long to wait when the last consumer
-is closed on a queue before redistributing any messages. see
-[here](#clusters).
-
-`send-to-dla-on-no-route`. If a message is sent to an address, but the
-server does not route it to any queues, for example, there might be no
-queues bound to that address, or none of the queues have filters that
-match, then normally that message would be discarded. However if this
-parameter is set to true for that address, if the message is not routed
-to any queues it will instead be sent to the dead letter address (DLA)
-for that address, if it exists.
-
-`address-full-policy`. This attribute can have one of the following
-values: PAGE, DROP, FAIL or BLOCK and determines what happens when an
-address where `max-size-bytes` is specified becomes full. The default
-value is PAGE. If the value is PAGE then further messages will be paged
-to disk. If the value is DROP then further messages will be silently
-dropped. If the value is FAIL then further messages will be dropped and
-an exception will be thrown on the client-side. If the value is BLOCK
-then client message producers will block when they try and send further
-messages. See the following chapters for more info [Flow Control](flow-control.md), [Paging](paging.md).
-
-`slow-consumer-threshold`. The minimum rate of message consumption
-allowed before a consumer is considered "slow." Measured in
-messages-per-second. Default is -1 (i.e. disabled); any other valid
-value must be greater than 0.
-
-`slow-consumer-policy`. What should happen when a slow consumer is
-detected. `KILL` will kill the consumer's connection (which will
-obviously impact any other client threads using that same connection).
-`NOTIFY` will send a CONSUMER\_SLOW management notification which an
-application could receive and take action with. See [slow consumers](slow-consumers.md) for more details
-on this notification.
-
-`slow-consumer-check-period`. How often to check for slow consumers on a
-particular queue. Measured in seconds. Default is 5. See [slow consumers](slow-consumers.md)
-for more information about slow consumer detection.
-
-`auto-create-jms-queues`. Whether or not the broker should automatically
-create a JMS queue when a JMS message is sent to a queue whose name fits
-the address `match` (remember, a JMS queue is just a core queue which has
-the same address and queue name) or a JMS consumer tries to connect to a
-queue whose name fits the address `match`. Queues which are auto-created
-are durable, non-temporary, and non-transient. Default is `true`. This is
-_DEPRECATED_.  See `auto-create-queues`.
-
-`auto-delete-jms-queues`. Whether or not the broker should automatically
-delete auto-created JMS queues when they have both 0 consumers and 0 messages.
-Default is `true`. This is _DEPRECATED_.  See `auto-delete-queues`.
-
-`auto-create-jms-topics`. Whether or not the broker should automatically
-create a JMS topic when a JMS message is sent to a topic whose name fits
-the address `match` (remember, a JMS topic is just a core address which has 
-one or more core queues mapped to it) or a JMS consumer tries to subscribe
-to a topic whose name fits the address `match`. Default is `true`. This is
-_DEPRECATED_.  See `auto-create-addresses`.
-
-`auto-delete-jms-topics`. Whether or not the broker should automatically
-delete auto-created JMS topics once the last subscription on the topic has
-been closed. Default is `true`. This is _DEPRECATED_.  See `auto-delete-addresses`.
-
-`auto-create-queues`. Whether or not the broker should automatically
-create a queue when a message is sent or a consumer tries to connect to a
-queue whose name fits the address `match`. Queues which are auto-created
-are durable, non-temporary, and non-transient. Default is `true`.
-
-`auto-delete-queues`. Whether or not the broker should automatically
-delete auto-created queues when they have both 0 consumers and 0 messages.
-Default is `true`.
-
-`auto-create-addresses`. Whether or not the broker should automatically
-create an address when a message is sent to or a consumer tries to consume
-from a queue which is mapped to an address whose name fits the address `match`.
-Default is `true`.
-
-`auto-delete-addresses`. Whether or not the broker should automatically
-delete auto-created addresses once the address no longer has any queues.
-Default is `true`.


Mime
View raw message