You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/11/03 09:55:50 UTC
qpid-broker-j git commit: QPID-8001: [Broker-J] Further updates for
v7.0.0
Repository: qpid-broker-j
Updated Branches:
refs/heads/master c5fd43289 -> b28150f50
QPID-8001: [Broker-J] Further updates for v7.0.0
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/b28150f5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/b28150f5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/b28150f5
Branch: refs/heads/master
Commit: b28150f50e473d24415859366974de0f306cd40f
Parents: c5fd432
Author: Keith Wall <kw...@apache.org>
Authored: Fri Nov 3 09:55:09 2017 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Fri Nov 3 09:55:45 2017 +0000
----------------------------------------------------------------------
.../org/apache/qpid/server/model/Exchange.java | 4 +++-
.../org/apache/qpid/server/model/Queue.java | 4 +++-
.../Java-Broker-Management-Managing-Broker.xml | 4 ----
...ava-Broker-Management-Managing-Exchanges.xml | 21 ++++++++++----------
.../Java-Broker-Management-Managing-Ports.xml | 6 ++++++
.../Java-Broker-Management-Managing-Queues.xml | 18 ++++++-----------
6 files changed, 29 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b28150f5/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java b/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
index 3dd62b5..f954395 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
@@ -53,7 +53,9 @@ public interface Exchange<X extends Exchange<X>> extends ConfiguredObject<X>, Me
// Attributes
- @ManagedAttribute
+ @ManagedAttribute(description = "Provides an alternate destination that, depending on behaviour requested by the "
+ + "producer, may be used if a message arriving at this exchange cannot be routed "
+ + "to at least one queue.")
AlternateBinding getAlternateBinding();
@ManagedAttribute(description = "(AMQP 1.0 only) Default behaviour to apply when a message is not routed to any queues", defaultValue = "DISCARD")
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b28150f5/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
index a2b69d1..c7ea2d8 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
@@ -110,7 +110,9 @@ public interface Queue<X extends Queue<X>> extends ConfiguredObject<X>,
description = "the ExclusivityPolicy to apply to queues where none is explicitly set")
String DEFAULT_EXCLUSIVITY = "NONE";
- @ManagedAttribute
+ @ManagedAttribute(description = "Provides an alternate destination that will be used when the number of delivery "
+ + "attempts exceeds the maximumDeliveryAttempt configured on this queue. Messages "
+ + "are also routed to this destination if this queue is deleted.")
AlternateBinding getAlternateBinding();
@ManagedAttribute( defaultValue = "${queue.defaultExclusivityPolicy}")
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b28150f5/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Broker.xml
----------------------------------------------------------------------
diff --git a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Broker.xml b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Broker.xml
index edf5267..6194209 100644
--- a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Broker.xml
+++ b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Broker.xml
@@ -35,10 +35,6 @@
environments that have many.</para>
</listitem>
<listitem>
- <para><emphasis>Heartbeating</emphasis>. Enables heartbeats between Broker and Clients.
- Heartbeats help discover severed TCP/IP connections in a timely manner.</para>
- </listitem>
- <listitem>
<para><emphasis>Confidential configuration encryption provider</emphasis>. The name of the
provider used to encrypt passwords and other secrets within the configuration. See <xref linkend="Java-Broker-Security-Configuration-Encryption"/>.</para>
</listitem>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b28150f5/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Exchanges.xml
----------------------------------------------------------------------
diff --git a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Exchanges.xml b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Exchanges.xml
index 651ba63..65dac87 100644
--- a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Exchanges.xml
+++ b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Exchanges.xml
@@ -55,21 +55,22 @@
<listitem>
<para><emphasis>Durable</emphasis>. Whether the exchange survives a restart.</para>
</listitem>
- </itemizedlist></para>
- </section>
- <section xml:id="Java-Broker-Management-Managing-Exchanges-Children">
- <title>Children</title>
- <para>
- <itemizedlist>
<listitem>
- <para>Binding</para>
+ <para><emphasis>Durable</emphasis>. Whether the exchange survives a restart.</para>
</listitem>
- </itemizedlist>
- </para>
+ <listitem>
+ <para><emphasis>alternateBinding</emphasis>. Provides an alternate destination that, depending on behaviour
+ requested by the producer, may be used if a message arriving at this exchange cannot be routed to at least
+ one queue.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>unroutableMessageBehaviour</emphasis>. (AMQP 1.0 only) Default behaviour to apply when a
+ message is not routed to any queues.</para>
+ </listitem>
+ </itemizedlist></para>
</section>
<section xml:id="Java-Broker-Management-Managing-Exchanges-Lifecycle">
<title>Lifecycle</title>
<para>Not supported</para>
</section>
-
</section>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b28150f5/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Ports.xml
----------------------------------------------------------------------
diff --git a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Ports.xml b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Ports.xml
index 28d0352..084312c 100644
--- a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Ports.xml
+++ b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Ports.xml
@@ -45,6 +45,12 @@
<footnote><para>Some Linux distributions govern the ceiling with a <literal>sysctl</literal>
setting <literal>net.core.somaxconn</literal>.</para></footnote></para>
</listitem>
+ <listitem>
+ <para><emphasis>qpid.port.heartbeatDelay</emphasis>. For AMQP 0-8..0-10 the default period with
+ which Broker and client will exchange heartbeat messages (in seconds). Clients may negotiate a
+ different heartbeat frequency or disable it altogether. For AMQP 1.0 this setting controls the
+ incoming idle timeout only. A value of 0 disables.</para>
+ </listitem>
</itemizedlist>
</para>
</section>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b28150f5/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Queues.xml
----------------------------------------------------------------------
diff --git a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Queues.xml b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Queues.xml
index 5574648..7a60bcc 100644
--- a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Queues.xml
+++ b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Queues.xml
@@ -84,26 +84,20 @@
a threshold, message size exceeded a threshold. These thresholds are soft. See <xref linkend="Java-Broker-Appendix-Queue-Alerts"/></para>
</listitem>
<listitem>
- <para><emphasis>Maximum Delivery Count/Alternate Exchange</emphasis>. See <xref linkend="Java-Broker-Runtime-Handling-Undeliverable-Messages"/></para>
+ <para><emphasis>Message Groups</emphasis>. See <xref linkend="Java-Broker-Concepts-Queues-Message-Grouping"/></para>
</listitem>
<listitem>
- <para><emphasis>Message Groups</emphasis>. See <xref linkend="Java-Broker-Concepts-Queues-Message-Grouping"/></para>
+ <para><emphasis>maximumDeliveryAttempts</emphasis>. See <xref linkend="Java-Broker-Runtime-Handling-Undeliverable-Messages"/></para>
</listitem>
- </itemizedlist></para>
- </section>
- <section xml:id="Java-Broker-Management-Managing-Queue-Children">
- <title>Children</title>
- <para>
- <itemizedlist>
<listitem>
- <para>Binding</para>
+ <para><emphasis>alternateBinding</emphasis>. Provides an alternate destination that will be used when the
+ number of delivery attempts exceeds the <emphasis>maximumDeliveryAttempts</emphasis> configured on this
+ queue. Messages are also routed to this destination if this queue is deleted.</para>
</listitem>
- </itemizedlist>
- </para>
+ </itemizedlist></para>
</section>
<section xml:id="Java-Broker-Management-Managing-Queue-Lifecycle">
<title>Lifecycle</title>
<para>Not supported</para>
</section>
-
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org