You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/06/22 14:37:04 UTC

[1/2] activemq-artemis git commit: This closes #2158

Repository: activemq-artemis
Updated Branches:
  refs/heads/master faf99cd68 -> 9a4d015a3


This closes #2158


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

Branch: refs/heads/master
Commit: 9a4d015a3755b2d6477cc33cdb153727907b0ac2
Parents: faf99cd cca73dc
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Jun 22 10:36:38 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Jun 22 10:36:38 2018 -0400

----------------------------------------------------------------------
 docs/user-manual/en/stomp.md | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------



[2/2] activemq-artemis git commit: ARTEMIS-1950 clarify STOMP durable sub header names

Posted by cl...@apache.org.
ARTEMIS-1950 clarify STOMP durable sub header names


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

Branch: refs/heads/master
Commit: cca73dc7dd45ddc34699546bd59c0588edb57db6
Parents: faf99cd
Author: Justin Bertram <jb...@apache.org>
Authored: Thu Jun 21 15:53:27 2018 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Jun 22 10:36:38 2018 -0400

----------------------------------------------------------------------
 docs/user-manual/en/stomp.md | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cca73dc7/docs/user-manual/en/stomp.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/stomp.md b/docs/user-manual/en/stomp.md
index 8ba11f2..4abe8d4 100644
--- a/docs/user-manual/en/stomp.md
+++ b/docs/user-manual/en/stomp.md
@@ -220,6 +220,15 @@ To delete a durable subscription the `client-id` header must be set on the
 `UNSUBSCRIBE` frame. The values for these headers should match what was set on
 the `SUBSCRIBE` frame to delete the corresponding durable subscription.
 
+Aside from `durable-subscription-name`, the broker also supports
+`durable-subscriber-name` (a deprecated property used before
+`durable-subscription-name`) as well as `activemq.subscriptionName` from ActiveMQ
+5.x. This is the order of precedence if the frame contains more than one of these:
+
+1) `durable-subscriber-name`
+2) `durable-subscription-name`
+3) `activemq.subscriptionName`
+
 It is possible to pre-configure durable subscriptions since the STOMP
 implementation creates the queue used for the durable subscription in a
 deterministic way (i.e. using the format of `client-id`.`subscription-name`).