From 461c0a7a450fec50c7cf35a896acbad5e247d288 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <ylecaillez@forgerock.com>
Date: Mon, 12 Oct 2015 09:34:55 +0000
Subject: [PATCH] Fixes from PR comments.
---
opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AdministrationConnectorConfiguration.xml | 6 ++++--
opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/Package.xml | 6 ++++--
opendj-server-legacy/src/messages/org/opends/messages/extension.properties | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AdministrationConnectorConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AdministrationConnectorConfiguration.xml
index 003899a..4f0a3a2 100644
--- a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AdministrationConnectorConfiguration.xml
+++ b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AdministrationConnectorConfiguration.xml
@@ -141,10 +141,12 @@
</adm:property>
<adm:property name="ssl-cert-nickname" mandatory="true" multi-valued="true">
<adm:synopsis>
- Specifies the nickname (also called the alias) of the certificate
+ Specifies the nicknames (also called the aliases) of the certificates
that the
<adm:user-friendly-name />
- will use when performing SSL communication.
+ should use when performing SSL communication. The property can be used multiple times
+ (referencing different nicknames) when an RSA, a DSA, and an ECC based server certificate
+ is used in parallel.
</adm:synopsis>
<adm:requires-admin-action>
<adm:server-restart />
diff --git a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/Package.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/Package.xml
index 6f14857..82a63f6 100644
--- a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/Package.xml
+++ b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/Package.xml
@@ -83,10 +83,12 @@
<adm:property name="ssl-cert-nickname" multi-valued="true">
<adm:TODO>Need a better default description.</adm:TODO>
<adm:synopsis>
- Specifies the nickname (also called the alias) of the certificate
+ Specifies the nicknames (also called the aliases) of the certificates
that the
<adm:user-friendly-name />
- should use when performing SSL communication.
+ should use when performing SSL communication. The property can be used multiple times
+ (referencing different nicknames) when an RSA, a DSA, and an ECC based server certificate
+ is used in parallel.
</adm:synopsis>
<adm:description>
This is only applicable when the
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/extension.properties b/opendj-server-legacy/src/messages/org/opends/messages/extension.properties
index 82bd3e7..55b1894 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/extension.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/extension.properties
@@ -1023,4 +1023,4 @@
definition '%s' is invalid because the range '%s' is too short
ERR_NO_KEY_ENTRY_IN_KEYSTORE_636=There is no private key entry in keystore %s
INFO_MISSING_KEY_TYPE_IN_ALIASES_637=Handshake for '%s': cipher requires \
- the aliase(s) %s \ to contains key(s) of type(s) %s.
+ the aliase(s) '%s' \ to contain key(s) of type(s) '%s'.
--
Gitblit v1.10.0