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/java/broker-plugins | |
| 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/java/broker-plugins')
| -rw-r--r-- | qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java index 3a98e627b0..3b03e2d680 100644 --- a/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java +++ b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java @@ -80,7 +80,7 @@ public class AppInfo appInfoMap.put("vhosts", "standalone"); appInfoMap.put("KeystorePath", sc.getConnectorKeyStorePath()); appInfoMap.put("PluginDirectory", sc.getPluginDirectory()); - appInfoMap.put("CertType", sc.getConnectorCertType()); + appInfoMap.put("KeyManagerFactoryAlgorithm", sc.getConnectorKeyManagerFactoryAlgorithm()); appInfoMap.put("QpidWork", sc.getQpidWork()); appInfoMap.put("Bind", sc.getBind()); } |