Repository: qpid-jms Updated Branches: refs/heads/master f36d1bb6c -> 2ed46c4a0
QPIDJMS-105 Add some documentation and touch up the associated Javadocs. Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/2ed46c4a Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/2ed46c4a Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/2ed46c4a Branch: refs/heads/master Commit: 2ed46c4a07ab5d7c78a21389adc81af47e17687b Parents: f36d1bb Author: Timothy Bish <tabish...@gmail.com> Authored: Wed Oct 7 11:53:14 2015 -0400 Committer: Timothy Bish <tabish...@gmail.com> Committed: Wed Oct 7 11:53:14 2015 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/qpid/jms/JmsConnectionFactory.java | 6 +++--- .../java/org/apache/qpid/jms/message/JmsMessageIDBuilder.java | 1 - qpid-jms-docs/Configuration.md | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2ed46c4a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java index e90695d..9c22fc4 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java @@ -673,10 +673,10 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact } /** - * Sets the format of the Message IDs used to populate the outgoing Messages + * Sets the type of the Message IDs used to populate the outgoing Messages * - * @param format - * The name of the Message format to use. + * @param type + * The name of the Message type to use when sending a message. */ public void setMessageIDType(String type) { this.messageIDBuilder = JmsMessageIDBuilder.BUILTIN.create(type); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2ed46c4a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageIDBuilder.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageIDBuilder.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageIDBuilder.java index 8963377..0418c13 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageIDBuilder.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageIDBuilder.java @@ -18,7 +18,6 @@ package org.apache.qpid.jms.message; import java.util.Locale; - /** * Interface for creating a custom Message ID builder to populate the * Message ID field of the outgoing message. http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2ed46c4a/qpid-jms-docs/Configuration.md ---------------------------------------------------------------------- diff --git a/qpid-jms-docs/Configuration.md b/qpid-jms-docs/Configuration.md index 6b3163b..fe49e24 100644 --- a/qpid-jms-docs/Configuration.md +++ b/qpid-jms-docs/Configuration.md @@ -88,6 +88,7 @@ The options apply to the behaviour of the JMS objects such as Connection, Sessio + **jms.connectTimeout** Timeout value that controls how long the client waits on Connection establishment before returning with an error. (By default the client waits 15 seconds for a connection to be established before failing). + **jms.clientIDPrefix** Optional prefix value that is used for generated Client ID values when a new Connection is created for the JMS ConnectionFactory. The default prefix is 'ID:'. + **jms.connectionIDPrefix** Optional prefix value that is used for generated Connection ID values when a new Connection is created for the JMS ConnectionFactory. This connection ID is used when logging some information from the JMS Connection object so a configurable prefix can make breadcrumbing the logs easier. The default prefix is 'ID:'. ++ **jms.messageIDType** Controls the type of the Message ID assigned to messages sent from the client. By default a generated String value is used on outgoing messages, other available types are UUID and UUID_STRING. These values control how many messages the remote peer can send to the client and be held in a prefetch buffer for each consumer instance. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
