From 948bfbdc46e09ea02808724760d03de51b8abb7f Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Sun, 29 Jan 2012 22:57:31 +0000 Subject: 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/qpid@1237504 13f79535-47bb-0310-9956-ffa450edef68 --- doc/book/src/Programming-In-Apache-Qpid.xml | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'doc') diff --git a/doc/book/src/Programming-In-Apache-Qpid.xml b/doc/book/src/Programming-In-Apache-Qpid.xml index 7094ada16c..17f0936595 100644 --- a/doc/book/src/Programming-In-Apache-Qpid.xml +++ b/doc/book/src/Programming-In-Apache-Qpid.xml @@ -3841,22 +3841,28 @@ log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n qpid.ssl_timeout long 60000 - Timeout value used by the Java SSL engine when waiting on operations. - + Timeout value used by the Java SSL engine when waiting on operations. + - qpid.ssl.keyStoreCertType + qpid.ssl.KeyManagerFactory.algorithm string - SunX509 - The certificate type.This could also be set per connection as well (see connection paramters). - + - + + The key manager factory algorithm name. If not set, defaults to the value returned from the Java runtime call KeyManagerFactory.getDefaultAlgorithm() + For compatibility with older clients, the synonym qpid.ssl.keyStoreCertType is supported. + + - qpid.ssl.trustStoreCertType + qpid.ssl.TrustManagerFactory.algorithm string - SunX509 - The certificate type.This could also be set per connection as well (see connection paramters). - + - + + The trust manager factory algorithm name. If not set, defaults to the value returned from the Java runtime call TrustManagerFactory.getDefaultAlgorithm() + For compatibility with older clients, the synonym qpid.ssl.trustStoreCertType is supported. + + -- cgit v1.2.1