diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2013-02-28 16:14:30 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2013-02-28 16:14:30 +0000 |
| commit | 9c73ef7a5ac10acd6a50d5d52bd721fc2faa5919 (patch) | |
| tree | 2a890e1df09e5b896a9b4168a7b22648f559a1f2 /doc/book/src/programming | |
| parent | 172d9b2a16cfb817bbe632d050acba7e31401cd2 (diff) | |
| download | qpid-python-asyncstore.tar.gz | |
Update from trunk r1375509 through r1450773asyncstore
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'doc/book/src/programming')
| -rw-r--r-- | doc/book/src/programming/Programming-In-Apache-Qpid.xml (renamed from doc/book/src/programming/Programming-In-Apache-Qpid-Book.xml) | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/doc/book/src/programming/Programming-In-Apache-Qpid-Book.xml b/doc/book/src/programming/Programming-In-Apache-Qpid.xml index fd32f42f2e..e2f6d8756c 100644 --- a/doc/book/src/programming/Programming-In-Apache-Qpid-Book.xml +++ b/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. |