diff options
| author | Keith Wall <kwall@apache.org> | 2012-01-29 22:57:31 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2012-01-29 22:57:31 +0000 |
| commit | 7e6ec5fd3acd4b118830183ac1003f249d464bc1 (patch) | |
| tree | 302d3b15e53107e8c49cf7b89af4cabdbd080029 /qpid/doc | |
| parent | 98a611242810c00526ce903e45c44c4c176cc7e6 (diff) | |
| download | qpid-python-7e6ec5fd3acd4b118830183ac1003f249d464bc1.tar.gz | |
QPID-3739: Java properties qpid.ssl.keyStoreCertType and qpid.ssl.trustStoreCertType have misleading names and would be better called qpid.ssl.[Key|Trust]ManagerFactory.algorithm
* Introduced two properties qpid.ssl.KeyManagerFactory.algorithm and qpid.ssl.TrustManagerFactory.algorithm to allow a client user to override the algorithm name used when Qpid client constructs a KeyManager or TrustManager.
* Continued to support qpid.ssl.keyStoreCertType and qpid.ssl.trustStoreCertType (now marked as deprecated)
* Introduced a new Java Broker configuration key connector/ssl/keyManagerFactoryAlgorithm
* Continued to support broker configuration key connector/ssl/certType (now marked as deprecated and will issue warning if used).
* Changed the default from hardcoded 'SunX509' to the value(s) returned by KeyManagerFactory#getDefaultAlgorithm() and TrustManagerFactory#getDefaultAlgorithm(). This allows the Java Broker and Client to be used out of the box on non-Sun JDKs without having to set qpid.ssl.KeyManagerFactory.algorithm or qpid.ssl.TrustManagerFactory.algorithm.
* Updated client docbook documentation.
Tested both Java Broker and Client on IBM JDK and ensured all 0-10 and 0-9-1 profiles pass (including SSLTest which was failing prior to this change).
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237504 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/doc')
| -rw-r--r-- | qpid/doc/book/src/Programming-In-Apache-Qpid.xml | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/qpid/doc/book/src/Programming-In-Apache-Qpid.xml b/qpid/doc/book/src/Programming-In-Apache-Qpid.xml index 7094ada16c..17f0936595 100644 --- a/qpid/doc/book/src/Programming-In-Apache-Qpid.xml +++ b/qpid/doc/book/src/Programming-In-Apache-Qpid.xml @@ -3841,22 +3841,28 @@ log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n <entry>qpid.ssl_timeout</entry> <entry>long</entry> <entry>60000</entry> - <entry><para>Timeout value used by the Java SSL engine when waiting on operations.</para></entry> - </row> + <entry><para>Timeout value used by the Java SSL engine when waiting on operations.</para></entry> + </row> <row> - <entry>qpid.ssl.keyStoreCertType</entry> + <entry>qpid.ssl.KeyManagerFactory.algorithm</entry> <entry>string</entry> - <entry>SunX509</entry> - <entry><para>The certificate type.</para><para>This could also be set per connection as well (see connection paramters).</para></entry> - </row> + <entry>-</entry> + <entry> + <para>The key manager factory algorithm name. If not set, defaults to the value returned from the Java runtime call <literal>KeyManagerFactory.getDefaultAlgorithm()</literal></para> + <para>For compatibility with older clients, the synonym <varname>qpid.ssl.keyStoreCertType</varname> is supported.</para> + </entry> + </row> <row> - <entry>qpid.ssl.trustStoreCertType</entry> + <entry>qpid.ssl.TrustManagerFactory.algorithm</entry> <entry>string</entry> - <entry>SunX509</entry> - <entry><para>The certificate type.</para><para>This could also be set per connection as well (see connection paramters).</para></entry> - </row> + <entry>-</entry> + <entry> + <para>The trust manager factory algorithm name. If not set, defaults to the value returned from the Java runtime call <literal>TrustManagerFactory.getDefaultAlgorithm()</literal></para> + <para>For compatibility with older clients, the synonym <varname>qpid.ssl.trustStoreCertType</varname> is supported.</para> + </entry> + </row> </tbody> </tgroup> </table> |