diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-11-25 15:42:06 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-11-25 15:42:06 +0000 |
| commit | d429e749a971b2157b56e07835ac29c885683342 (patch) | |
| tree | 1c389a5c74e576d1ed6eb2a88fb901595d311fed /qpid/doc/book/src/programming | |
| parent | 1f1439660e359ebccef08e4b4ede92a6e1f04d4f (diff) | |
| download | qpid-python-d429e749a971b2157b56e07835ac29c885683342.tar.gz | |
QPID-4468: restore connection level ssl option to provide compatibility with older client configuration, add ability to override brokerlist ssl option
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1413364 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/doc/book/src/programming')
| -rw-r--r-- | qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml b/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml index fd32f42f2e..e2f6d8756c 100644 --- a/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml +++ b/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml @@ -3087,6 +3087,22 @@ spout - -content "$(cat rdu.xml | sed -e 's/70/45/')" xml/weather </para> </entry> </row> + <row> + <entry> + ssl + </entry> + <entry> + boolean + </entry> + <entry> + <para> + If <literal>ssl='true'</literal>, use SSL for all broker connections. Overrides any per-broker settings in the brokerlist (see below) entries. If not specified, the brokerlist entry for each given broker is used to determine whether SSL is used. + </para> + <para> + Introduced in version 0.22. + </para> + </entry> + </row> </tbody> </tgroup> </table> @@ -3237,6 +3253,7 @@ spout - -content "$(cat rdu.xml | sed -e 's/70/45/')" xml/weather trust_store_password </entry> <entry> + -- </entry> <entry> Trust store password @@ -3247,6 +3264,7 @@ spout - -content "$(cat rdu.xml | sed -e 's/70/45/')" xml/weather key_store </entry> <entry> + -- </entry> <entry> path to key store @@ -3271,7 +3289,9 @@ spout - -content "$(cat rdu.xml | sed -e 's/70/45/')" xml/weather Boolean </entry> <entry> - If <literal>ssl='true'</literal>, the JMS client will encrypt the connection using SSL. + <para>If <literal>ssl='true'</literal>, the JMS client will encrypt the connection to this broker using SSL.</para> + + <para>This can also be set/overridden for all brokers using the <link linkend="section-jms-connection-url">Connection URL</link> options.</para> </entry> </row> <row> @@ -3292,7 +3312,7 @@ spout - -content "$(cat rdu.xml | sed -e 's/70/45/')" xml/weather ssl_cert_alias </entry> <entry> - + -- </entry> <entry> If multiple certificates are present in the keystore, the alias will be used to extract the correct certificate. |