From 111c848e2d90d962a7f48d7b4121304247829473 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 05 Sep 2007 06:40:30 +0000
Subject: [PATCH] The following changes are targetted to fix a certain number of issues related to the setup command line:
---
opends/src/messages/messages/tools.properties | 127 +++++++++++++++++++++++++++++++++---------
1 files changed, 99 insertions(+), 28 deletions(-)
diff --git a/opends/src/messages/messages/tools.properties b/opends/src/messages/messages/tools.properties
index 1655a2d..fc8c231 100644
--- a/opends/src/messages/messages/tools.properties
+++ b/opends/src/messages/messages/tools.properties
@@ -216,9 +216,9 @@
INFO_DESCRIPTION_ENCODING_115=Use the specified character set for \
command-line input
INFO_DESCRIPTION_VERBOSE_116=Use verbose mode
-INFO_DESCRIPTION_KEYSTOREPATH_117=Certificate keystore path
+INFO_DESCRIPTION_KEYSTOREPATH_117=Certificate key store path
INFO_DESCRIPTION_TRUSTSTOREPATH_118=Certificate trust store path
-INFO_DESCRIPTION_KEYSTOREPASSWORD_119=Certificate keystore PIN
+INFO_DESCRIPTION_KEYSTOREPASSWORD_119=Certificate key store PIN
INFO_DESCRIPTION_HOST_120=Directory server hostname or IP address
INFO_DESCRIPTION_PORT_121=Directory server port number
INFO_DESCRIPTION_SHOWUSAGE_122=Display this usage information
@@ -669,9 +669,9 @@
INFO_STOPDS_DESCRIPTION_STOP_TIME_384=Time to begin the shutdown in \
YYYYMMDDhhmmss format (local time)
INFO_STOPDS_DESCRIPTION_TRUST_ALL_385=Trust all server SSL certificates
-INFO_STOPDS_DESCRIPTION_KSFILE_386=Certificate keystore path
-INFO_STOPDS_DESCRIPTION_KSPW_387=Certificate keystore PIN
-INFO_STOPDS_DESCRIPTION_KSPWFILE_388=Certificate keystore PIN file
+INFO_STOPDS_DESCRIPTION_KSFILE_386=Certificate key store path
+INFO_STOPDS_DESCRIPTION_KSPW_387=Certificate key store PIN
+INFO_STOPDS_DESCRIPTION_KSPWFILE_388=Certificate key store PIN file
INFO_STOPDS_DESCRIPTION_TSFILE_389=Certificate trust store path
INFO_STOPDS_DESCRIPTION_TSPW_390=Certificate trust store PIN
INFO_STOPDS_DESCRIPTION_TSPWFILE_391=Certificate trust store PIN file
@@ -861,7 +861,7 @@
INFO_INSTALLDS_DESCRIPTION_LDAPPORT_493=Specifies the port on which the \
Directory Server should listen for LDAP communication
INFO_INSTALLDS_DESCRIPTION_SKIPPORT_494=Skip the check to determine whether \
- the specified LDAP port is usable
+ the specified ports are usable
INFO_INSTALLDS_DESCRIPTION_ROOTDN_495=Specifies the DN for the initial root \
user for the Directory Server
INFO_INSTALLDS_DESCRIPTION_ROOTPW_496=Specifies the password for the initial \
@@ -886,7 +886,7 @@
INFO_INSTALLDS_PROMPT_IMPORT_505=Do you wish to populate the directory \
database with information from an existing LDIF file?
INFO_INSTALLDS_PROMPT_IMPORT_FILE_506=Please specify the path to the LDIF \
- file containing the data to import
+ file containing the data to import:
SEVERE_ERR_INSTALLDS_TWO_CONFLICTING_ARGUMENTS_507=ERROR: You may not \
provide both the %s and the %s arguments at the same time
INFO_INSTALLDS_PROMPT_ADDBASE_508=Would you like to have the base %s entry \
@@ -906,9 +906,9 @@
for the initial root user. When performing a quiet installation, this must \
be provided using either the %s or the %s argument
INFO_INSTALLDS_PROMPT_ROOT_PASSWORD_514=Please provide the password to use \
- for the initial root user
+ for the initial root user:
INFO_INSTALLDS_PROMPT_CONFIRM_ROOT_PASSWORD_515=Please re-enter the password \
- for confirmation
+ for confirmation:
INFO_INSTALLDS_STATUS_CONFIGURING_DS_516=Applying the requested configuration \
to the Directory Server...
INFO_INSTALLDS_STATUS_CREATING_BASE_LDIF_517=Creating a temporary LDIF file \
@@ -1186,10 +1186,10 @@
communication with the Directory Server
INFO_LDAPPWMOD_DESCRIPTION_BLIND_TRUST_648=Blindly trust any SSL certificate \
presented by the server
-INFO_LDAPPWMOD_DESCRIPTION_KEYSTORE_649=The path to the keystore to use when \
+INFO_LDAPPWMOD_DESCRIPTION_KEYSTORE_649=The path to the key store to use when \
establishing SSL/TLS communication with the server
INFO_LDAPPWMOD_DESCRIPTION_KEYSTORE_PINFILE_650=The path to a file containing \
- the PIN needed to access the contents of the keystore
+ the PIN needed to access the contents of the key store
INFO_LDAPPWMOD_DESCRIPTION_TRUSTSTORE_651=The path to the trust store to use \
when establishing SSL/TLS communication with the server
INFO_LDAPPWMOD_DESCRIPTION_TRUSTSTORE_PINFILE_652=The path to a file \
@@ -1252,8 +1252,8 @@
from a Directory Server backend in LDIF form
INFO_LDIFIMPORT_TOOL_DESCRIPTION_687=This utility may be used to import LDIF \
data into a Directory Server backend
-INFO_INSTALLDS_TOOL_DESCRIPTION_688=This utility may be used to define a base \
- configuration for the Directory Server
+INFO_INSTALLDS_TOOL_DESCRIPTION_688=This utility may be used to setup the \
+ Directory Server
INFO_LDAPCOMPARE_TOOL_DESCRIPTION_689=This utility may be used to perform \
LDAP compare operations in the Directory Server
INFO_LDAPDELETE_TOOL_DESCRIPTION_690=This utility may be used to perform LDAP \
@@ -1292,7 +1292,7 @@
SEVERE_ERR_TOOL_SASLEXTERNAL_NEEDS_SSL_OR_TLS_706=SASL EXTERNAL \
authentication may only be requested if SSL or StartTLS is used
SEVERE_ERR_TOOL_SASLEXTERNAL_NEEDS_KEYSTORE_707=SASL EXTERNAL authentication \
- may only be used if a client certificate keystore is specified
+ may only be used if a client certificate key store is specified
INFO_LDAPSEARCH_PSEARCH_CHANGE_TYPE_708=# Persistent search change type: %s
INFO_LDAPSEARCH_PSEARCH_PREVIOUS_DN_709=# Persistent search previous entry \
DN: %s
@@ -1310,7 +1310,7 @@
INFO_LDAPSEARCH_ACCTUSABLE_LOCKED_718=# The account is locked
INFO_LDAPSEARCH_ACCTUSABLE_TIME_UNTIL_UNLOCK_719=# Time until the account \
is unlocked: %s
-INFO_DESCRIPTION_KEYSTOREPASSWORD_FILE_720=Certificate keystore PIN file
+INFO_DESCRIPTION_KEYSTOREPASSWORD_FILE_720=Certificate key store PIN file
INFO_DESCRIPTION_TRUSTSTOREPASSWORD_721=Certificate trust store PIN
INFO_DESCRIPTION_TRUSTSTOREPASSWORD_FILE_722=Certificate trust store PIN file
INFO_LISTBACKENDS_TOOL_DESCRIPTION_723=This utility may be used to list the \
@@ -1353,10 +1353,10 @@
INFO_INSTALLDS_DESCRIPTION_SAMPLE_DATA_753=Specifies that the database should \
be populated with the specified number of sample entries
INFO_INSTALLDS_HEADER_POPULATE_TYPE_754=Options for populating the database:
-INFO_INSTALLDS_POPULATE_OPTION_BASE_ONLY_755=Only create the base entry
-INFO_INSTALLDS_POPULATE_OPTION_LEAVE_EMPTY_756=Leave the database empty
-INFO_INSTALLDS_POPULATE_OPTION_IMPORT_LDIF_757=Import data from an LDIF file
-INFO_INSTALLDS_POPULATE_OPTION_GENERATE_SAMPLE_758=Load \
+INFO_INSTALLDS_POPULATE_OPTION_BASE_ONLY_755=1. Only create the base entry
+INFO_INSTALLDS_POPULATE_OPTION_LEAVE_EMPTY_756=2. Leave the database empty
+INFO_INSTALLDS_POPULATE_OPTION_IMPORT_LDIF_757=3. Import data from an LDIF file
+INFO_INSTALLDS_POPULATE_OPTION_GENERATE_SAMPLE_758=4. Load \
automatically-generated sample data
INFO_INSTALLDS_PROMPT_POPULATE_CHOICE_759=Database population selection:
SEVERE_ERR_INSTALLDS_NO_SUCH_LDIF_FILE_780=ERROR: The specified LDIF file %s \
@@ -1366,7 +1366,7 @@
SEVERE_ERR_INSTALLDS_CANNOT_CREATE_TEMPLATE_FILE_782=ERROR: Cannot create \
the template file for generating sample data: %s
INFO_LDAPPWMOD_DESCRIPTION_KEYSTORE_PIN_783=The PIN needed to access the \
- contents of the keystore
+ contents of the key store
INFO_LDAPPWMOD_DESCRIPTION_TRUSTSTORE_PIN_784=The PIN needed to access the \
contents of the trust store
INFO_LDIFEXPORT_DESCRIPTION_EXCLUDE_OPERATIONAL_785=Exclude operational \
@@ -1548,7 +1548,7 @@
occurred while attempting to update the trust manager provider DN used for \
LDAPS communication: %s
INFO_CONFIGDS_DESCRIPTION_KEYMANAGER_PATH_870=Specifies the path of the \
- keystore to be used by the key manager provider
+ key store to be used by the key manager provider
INFO_CONFIGDS_DESCRIPTION_CERTNICKNAME_871=Specifies the nickname of the \
certificate that the connection handler should use when accepting SSL-based \
connections or performing StartTLS negotiation
@@ -1622,9 +1622,9 @@
get and set password policy state information
INFO_PWPSTATE_DESCRIPTION_SASLOPTIONS_1103=SASL bind options
INFO_PWPSTATE_DESCRIPTION_TRUST_ALL_1104=Trust all server SSL certificates
-INFO_PWPSTATE_DESCRIPTION_KSFILE_1105=Certificate keystore path
-INFO_PWPSTATE_DESCRIPTION_KSPW_1106=Certificate keystore PIN
-INFO_PWPSTATE_DESCRIPTION_KSPWFILE_1107=Certificate keystore PIN file
+INFO_PWPSTATE_DESCRIPTION_KSFILE_1105=Certificate key store path
+INFO_PWPSTATE_DESCRIPTION_KSPW_1106=Certificate key store PIN
+INFO_PWPSTATE_DESCRIPTION_KSPWFILE_1107=Certificate key store PIN file
INFO_PWPSTATE_DESCRIPTION_TSFILE_1108=Certificate trust store path
INFO_PWPSTATE_DESCRIPTION_TSPW_1109=Certificate trust store PIN
INFO_PWPSTATE_DESCRIPTION_TSPWFILE_1110=Certificate trust store PIN file
@@ -1885,9 +1885,9 @@
INFO_LDAP_CONN_DESCRIPTION_BINDPWFILE_1306=Bind password file
INFO_LDAP_CONN_DESCRIPTION_SASLOPTIONS_1307=SASL bind options
INFO_LDAP_CONN_DESCRIPTION_TRUST_ALL_1308=Trust all server SSL certificates
-INFO_LDAP_CONN_DESCRIPTION_KSFILE_1309=Certificate keystore path
-INFO_LDAP_CONN_DESCRIPTION_KSPW_1310=Certificate keystore PIN
-INFO_LDAP_CONN_DESCRIPTION_KSPWFILE_1311=Certificate keystore PIN file
+INFO_LDAP_CONN_DESCRIPTION_KSFILE_1309=Certificate key store path
+INFO_LDAP_CONN_DESCRIPTION_KSPW_1310=Certificate key store PIN
+INFO_LDAP_CONN_DESCRIPTION_KSPWFILE_1311=Certificate key store PIN file
INFO_LDAP_CONN_DESCRIPTION_TSFILE_1312=Certificate trust store path
INFO_LDAP_CONN_DESCRIPTION_TSPW_1313=Certificate trust store PIN
INFO_LDAP_CONN_DESCRIPTION_TSPWFILE_1314=Certificate trust store PIN file
@@ -2007,6 +2007,77 @@
passed to the JVM when running the server
SEVERE_ERR_CREATERC_JAVA_HOME_DOESNT_EXIST_1378=The directory %s specified \
as the JAVA_HOME path does not exist or is not a directory
-SEVERE_ERR_UPGRADE_INCOMPATIBLE_ARGS_1379=The argument '%s' is incompatible \
+INFO_INSTALLDS_STATUS_COMMAND_LINE_1379=To see basic server configuration \
+status and configuration you can launch %s
+INFO_INSTALLDS_PROMPT_ENABLE_SSL_1380=Do you want to enable SSL?
+INFO_INSTALLDS_PROMPT_LDAPSPORT_1381=On which port would you like the \
+ Directory Server to accept connections from LDAPS clients?
+INFO_INSTALLDS_ENABLE_STARTTLS_1382=Do you want to enable Start TLS?
+INFO_INSTALLDS_PROMPT_JKS_PATH_1383=Java Key Store (JKS) path:
+INFO_INSTALLDS_PROMPT_PKCS12_PATH_1384=PKCS#12 key Store path:
+INFO_INSTALLDS_PROMPT_KEYSTORE_PASSWORD_1385=Key store PIN:
+INFO_INSTALLDS_PROMPT_CERTNICKNAME_1386=Use nickname %s?
+INFO_INSTALLDS_HEADER_CERT_TYPE_1387=Certificate server options:
+INFO_INSTALLDS_CERT_OPTION_SELF_SIGNED_1388=1. Generate self-signed \
+ certificate (recommended for testing purposes only)
+INFO_INSTALLDS_CERT_OPTION_JKS_1389=2. Use an existing certificate located on \
+ a Java Key Store (JKS)
+INFO_INSTALLDS_CERT_OPTION_PKCS12_1390=3. Use an existing certificate located \
+ on a PKCS#12 key store
+INFO_INSTALLDS_CERT_OPTION_PKCS11_1391=4. Use an existing certificate on a \
+ PKCS#11 token
+INFO_INSTALLDS_PROMPT_CERT_TYPE_CHOICE_1392=Certificate type selection:
+INFO_INSTALLDS_PROMPT_START_SERVER_1393=Do you want to start the server when \
+ the configuration is completed?
+SEVERE_ERR_INSTALLDS_CERTNICKNAME_NOT_FOUND_1394=The provided certificate \
+ nickname could not be found. The key store contains the following \
+ certificate nicknames: %s
+SEVERE_ERR_INSTALLDS_MUST_PROVIDE_CERTNICKNAME_1395=The key store contains the \
+ following certificate nicknames: %s.%nYou have to provide the nickname of the \
+ certificate you want to use
+INFO_INSTALLDS_DESCRIPTION_DO_NOT_START_1396=Do not start the server when the \
+ configuration is completed
+INFO_INSTALLDS_DESCRIPTION_ENABLE_STARTTLS_1397=Enable StartTLS to allow \
+ secure communication with the server using the LDAP port
+INFO_INSTALLDS_DESCRIPTION_LDAPSPORT_1398=Specifies the port on which the \
+ Directory Server should listen for LDAPS communication. The LDAPS port will \
+ be configured and SSL will be enabled only if this argument is explicitly \
+ specified
+INFO_INSTALLDS_DESCRIPTION_USE_SELF_SIGNED_1399=Specifies to generate a \
+ self-signed certificate that the server should use when accepting SSL-based \
+ connections or performing StartTLS negotiation
+INFO_INSTALLDS_DESCRIPTION_USE_PKCS11_1400=Specifies to use a certificate in a \
+ PKCS#11 token that the server should use when accepting SSL-based \
+ connections or performing StartTLS negotiation
+INFO_INSTALLDS_DESCRIPTION_USE_JAVAKEYSTORE_1401=Specifies the path of a Java \
+ Key Store (JKS) containing a certificate to be used as the server certificate
+INFO_INSTALLDS_DESCRIPTION_USE_PKCS12_1402=Specifies the path of a PKCS#12 key \
+ store containing the certificate that the server should use when accepting \
+ SSL-based connections or performing StartTLS negotiation
+INFO_INSTALLDS_DESCRIPTION_KEYSTOREPASSWORD_1403=Certificate key store PIN. \
+ A PIN is required when you specify to use an existing certificate (JKS, \
+ PKCS#12 or PKCS#11) as server certificate
+INFO_INSTALLDS_DESCRIPTION_KEYSTOREPASSWORD_FILE_1404=Certificate key store \
+ PIN file. A PIN is required when you specify to use an existing certificate \
+ (JKS, PKCS#12 or PKCS#11) as server certificate
+INFO_INSTALLDS_DESCRIPTION_CERT_NICKNAME_1405=Specifies the nickname of the \
+ certificate that the server should use when accepting SSL-based \
+ connections or performing StartTLS negotiation
+SEVERE_ERR_INSTALLDS_SEVERAL_CERTIFICATE_TYPE_SPECIFIED_1406=You have \
+ specified several certificate types to be used. Only one certificate type \
+ (self-signed, JKS, PKCS#12 or PCKS#11) is allowed
+SEVERE_ERR_INSTALLDS_CERTIFICATE_REQUIRED_FOR_SSL_OR_STARTTLS_1407=You have \
+ chosen to enable SSL or StartTLS. You must specify which type of certificate \
+ you want the server to use
+SEVERE_ERR_INSTALLDS_NO_KEYSTORE_PASSWORD_1408=You must provide the PIN of the \
+ keystore to retrieve the certificate to be used by the server. You can use \
+ {%s} or {%s}
+INFO_INSTALLDS_DESCRIPTION_NO_PROMPT_1409=Perform an installation in \
+ non-interactive mode. If some data in the command is missing the user will \
+ not be prompted and the tool will fail
+SEVERE_ERR_INSTALLDS_SSL_OR_STARTTLS_REQUIRED_1410=You have specified to use a \
+ certificate as server certificate. You must enable SSL (using option {%s}) \
+ or Start TLS (using option %s)
+SEVERE_ERR_UPGRADE_INCOMPATIBLE_ARGS_1411=The argument '%s' is incompatible \
with '%s'
--
Gitblit v1.10.0