diff options
Diffstat (limited to 'doc/book/src/Programming-In-Apache-Qpid.xml')
| -rw-r--r-- | doc/book/src/Programming-In-Apache-Qpid.xml | 61 |
1 files changed, 35 insertions, 26 deletions
diff --git a/doc/book/src/Programming-In-Apache-Qpid.xml b/doc/book/src/Programming-In-Apache-Qpid.xml index 4d72864cb1..3950b375da 100644 --- a/doc/book/src/Programming-In-Apache-Qpid.xml +++ b/doc/book/src/Programming-In-Apache-Qpid.xml @@ -1722,7 +1722,7 @@ try { <row> <entry> - <literal>username</literal> + username </entry> <entry> string @@ -1733,7 +1733,7 @@ try { </row> <row> <entry> - <literal>password</literal> + password </entry> <entry> string @@ -1744,22 +1744,35 @@ try { </row> <row> <entry> - <literal>sasl_mechanisms</literal> + sasl-mechanism </entry> <entry> string </entry> <entry> - The specific SASL mechanisms to use with the python + The specific SASL mechanism to use with the c++ + client when authenticating to the broker. Only a + single value can be specified at present. [C++ only]. + </entry> + </row> + <row> + <entry> + sasl_mechanisms + </entry> + <entry> + string + </entry> + <entry> + The specific SASL mechanism to use with the python client when authenticating to the broker. The value - is a space separated list. + is a space separated list in order of preference. [Python only]. </entry> </row> <row> <entry> - <literal>reconnect</literal> + reconnect </entry> <entry> boolean @@ -1770,7 +1783,7 @@ try { </row> <row> <entry> - <literal>reconnect_timeout</literal> + <literal>reconnect_timeout [Python]</literal> <literal>reconnect-timeout [C++]</literal> </entry> <entry> integer @@ -1781,7 +1794,7 @@ try { </row> <row> <entry> - <literal>reconnect_limit</literal> + <literal>reconnect_limit [Python]</literal> <literal>reconnect-limit [C++]</literal> </entry> <entry> integer @@ -1792,7 +1805,7 @@ try { </row> <row> <entry> - <literal>reconnect_interval_min</literal> + <literal>reconnect_interval_min [Python]</literal> <literal>reconnect-interval-min [C++]</literal> </entry> <entry> integer representing time in seconds @@ -1803,7 +1816,7 @@ try { </row> <row> <entry> - <literal>reconnect_interval_max</literal> + <literal>reconnect_interval_max [Python]</literal> <literal>reconnect-interval-max [C++]</literal> </entry> <entry> integer representing time in seconds @@ -1814,7 +1827,7 @@ try { </row> <row> <entry> - <literal>reconnect_interval</literal> + <literal>reconnect_interval [Python]</literal> <literal>reconnect-interval [C++]</literal> </entry> <entry> integer representing time in seconds @@ -1826,7 +1839,7 @@ try { <row> <entry> - <literal>heartbeat</literal> + heartbeat </entry> <entry> integer representing time in seconds @@ -1839,7 +1852,7 @@ try { </row> <row> <entry> - <literal>protocol</literal> + protocol </entry> <entry> string @@ -1850,7 +1863,7 @@ try { </row> <row> <entry> - <literal>tcp-nodelay</literal> + tcp-nodelay </entry> <entry> boolean @@ -3443,8 +3456,9 @@ log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n <entry>qpid.amqp.version</entry> <entry>string</entry> <entry>0-10</entry> - <entry><para>Sets the AMQP version to be used - currently supports one of {0-8,0-9,0-91,0-10}.</para><para>The client will begin negotiation at the specified version and only negotiate downwards if the Broker does not support the specified version.</para></entry> - </row> + <entry>Sets the AMQP version to be used - currently supports one of {0-8,0-9,0-91,0-10}</entry> + </row> + <row> <entry>qpid.heartbeat</entry> <entry>int</entry> @@ -3609,20 +3623,15 @@ log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n <entry>qpid.transport</entry> <entry>string</entry> <entry>org.apache.qpid.transport.network.io.IoNetworkTransport</entry> - <entry><para>The transport implementation to be used.</para><para>A user could specify an alternative transport mechanism that implements the <varname>org.apache.qpid.transport.network.NetworkTransport</varname> interface.</para></entry> - </row> - <row> - <entry>qpid.sync_op_timeout</entry> - <entry>long</entry> - <entry>60000</entry> - <entry><para>The length of time (in milliseconds) to wait for a synchronous operation to complete.</para><para>For compatibility with older clients, the synonym <varname>amqj.default_syncwrite_timeout</varname> is supported.</para></entry> - </row> + <entry><para>The transport implementation to be used.</para><para>A user could specify an alternative transport mechanism that implements the <varname>org.apache.qpid.transport.network.NetworkTransport</varname> interface.</para></entry> + </row> + <row> <entry>amqj.tcp_nodelay</entry> <entry>boolean</entry> <entry>false</entry> - <entry><para>Sets the TCP_NODELAY property of the underlying socket.</para><para>This could also be set per connection as well (see connection paramters).</para></entry> - </row> + <entry><para>Sets the TCP_NODELAY property of the underlying socket.</para><para>This could also be set per connection as well (see connection paramters).</para></entry> + </row> </tbody> </tgroup> </table> |