QPID-8392 : Remove docs references to outdated DLQ configuration
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
index da95578..97fceb2 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
@@ -959,7 +959,7 @@
exception(session,
method,
ExecutionErrorCode.NOT_FOUND,
- String.format("Unknown alternate exchange '%s'", e.getAlternateBindingName()));
+ String.format("Unknown alternate destination '%s'", e.getAlternateBindingName()));
}
catch(NoFactoryForTypeException e)
{
@@ -1658,7 +1658,7 @@
exception(session,
method,
ExecutionErrorCode.NOT_FOUND,
- String.format("Unknown alternate exchange '%s'", e.getAlternateBindingName()));
+ String.format("Unknown alternate destination '%s'", e.getAlternateBindingName()));
}
catch (IllegalArgumentException | IllegalConfigurationException e)
{
diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
index 152e919..4c4ebd2 100644
--- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
+++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
@@ -2701,7 +2701,7 @@
}
catch (UnknownAlternateBindingException e)
{
- final String message = String.format("Unknown alternate exchange '%s'", e.getAlternateBindingName());
+ final String message = String.format("Unknown alternate destination '%s'", e.getAlternateBindingName());
_connection.sendConnectionClose(ErrorCodes.NOT_FOUND, message, getChannelId());
}
@@ -3155,7 +3155,7 @@
}
catch (UnknownAlternateBindingException e)
{
- final String message = String.format("Unknown alternate exchange: '%s'", e.getAlternateBindingName());
+ final String message = String.format("Unknown alternate destination: '%s'", e.getAlternateBindingName());
_connection.sendConnectionClose(ErrorCodes.NOT_FOUND, message, getChannelId());
}
catch (IllegalArgumentException | IllegalConfigurationException e)
diff --git a/doc/java-broker/src/docbkx/Java-Broker-Appendix-Queue-Declaration-Arguments.xml b/doc/java-broker/src/docbkx/Java-Broker-Appendix-Queue-Declaration-Arguments.xml
index ad90280..5905e75 100644
--- a/doc/java-broker/src/docbkx/Java-Broker-Appendix-Queue-Declaration-Arguments.xml
+++ b/doc/java-broker/src/docbkx/Java-Broker-Appendix-Queue-Declaration-Arguments.xml
@@ -161,15 +161,6 @@
<para>Specifies this queue's maximum delivery count.</para>
</entry>
</row>
- <row xml:id="Java-Broker-Appendix-Queue-Declare-Arguments-X-Qpid-DLQ-Enabled">
- <entry>
- <para>x-qpid-dlq-enabled</para>
- </entry>
- <entry>
- <para>If set <literal>true</literal>, a dead letter queue will be automatically created
- and assigned as this queue's <literal>alternateBinding</literal>.</para>
- </entry>
- </row>
<row xml:id="Java-Broker-Appendix-Queue-Declare-Arguments-X-Single-Active-Consumer">
<entry>
<para>x-single-active-consumer</para>
diff --git a/doc/java-broker/src/docbkx/Java-Broker-Appendix-System-Properties.xml b/doc/java-broker/src/docbkx/Java-Broker-Appendix-System-Properties.xml
index 561061d..9929dbf 100644
--- a/doc/java-broker/src/docbkx/Java-Broker-Appendix-System-Properties.xml
+++ b/doc/java-broker/src/docbkx/Java-Broker-Appendix-System-Properties.xml
@@ -43,12 +43,6 @@
<entry>Factor to determine the maximum length of that may elapse between heartbeats being
received from the peer before a connection is deemed to have been broken.</entry>
</row>
- <row xml:id="Java-Broker-Appendix-System-Properties-Broker-Dead-Letter-Queue-Suffix">
- <entry>qpid.broker_dead_letter_queue_suffix</entry>
- <entry>_DLQ</entry>
- <entry>Used with the <xref linkend="Java-Broker-Runtime-Handling-Undeliverable-Messages-Dead-Letter-Queues"/>
- feature. Governs the suffix used when generating a name for a Dead Letter Queue.</entry>
- </row>
<row xml:id="Java-Broker-Appendix-System-Properties-Broker-Status-Updates">
<entry>qpid.broker_status_updates</entry>
<entry>true</entry>
