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/quicksetup.properties |   46 +++++++++++++++++++++++++++-------------------
 1 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/opends/src/messages/messages/quicksetup.properties b/opends/src/messages/messages/quicksetup.properties
index 66cc353..cca56d7 100644
--- a/opends/src/messages/messages/quicksetup.properties
+++ b/opends/src/messages/messages/quicksetup.properties
@@ -219,7 +219,7 @@
 INFO_DETAILS_LABEL=Details:
 INFO_DIRECTORY_DATA_LABEL=Directory Data:
 INFO_DIRECTORY_EXISTS_NOT_EMPTY=The directory %s is not empty.
-INFO_DIRECTORY_MANAGER_DN_IS_CONFIG_DN=The provided Administrative User DN is \
+INFO_DIRECTORY_MANAGER_DN_IS_CONFIG_DN=The provided Root User DN is \
  used for the configuration of the Directory Server.
 INFO_DIRECTORY_NOT_WRITABLE=You do not have write access on the directory %s. \
  You must have file right access on the Installation directory.
@@ -237,9 +237,9 @@
 INFO_EMPTY_ADMINISTRATOR_UID=You must provide a Global Administrative User \
  ID.
 INFO_EMPTY_BASE_DN=You must provide a Directory Base DN.
-INFO_EMPTY_DIRECTORY_MANAGER_DN=You must provide an Administrative User DN.
+INFO_EMPTY_DIRECTORY_MANAGER_DN=You must provide an Root User DN.
 INFO_EMPTY_HOST_NAME=You must provide the name of the host.
-INFO_EMPTY_PWD=You must provide the password of the Administrative User.
+INFO_EMPTY_PWD=You must provide the password of the Root User.
 INFO_EMPTY_REMOTE_DN=You must provide a value for the Administrative User.
 INFO_EMPTY_REMOTE_HOST=You must provide the fully qualified name of the host.
 INFO_EMPTY_REMOTE_PWD=You must provide an Admin User password.
@@ -259,12 +259,12 @@
  communication.
 INFO_ERROR_ACCESSING_JKS_KEYSTORE=Could not access the JKS key store.  Check \
  that the contents of the file correspond to a valid JKS key store, that you \
- have access rights to it and that the provided password is valid.
+ have access rights to it and that the provided PIN is valid.
 INFO_ERROR_ACCESSING_PKCS11_KEYSTORE=Could not access the PKCS#11 key store. \
- Check that is installed and that the provided password is valid.
+ Check that is installed and that the provided PIN is valid.
 INFO_ERROR_ACCESSING_PKCS12_KEYSTORE=Could not access the PKCS#12 key store. \
  Check that the contents of the file correspond to a valid PKCS#12 key store, \
- that you have access rights to it and that the provided password is valid.
+ that you have access rights to it and that the provided PIN is valid.
 INFO_ERROR_APPLY_LDIF_ADD=Error processing add operation of %s: %s
 INFO_ERROR_APPLY_LDIF_DELETE=Error processing delete operation of %s: %s
 INFO_ERROR_APPLY_LDIF_MODIFY=Error processing modification operation of %s: \
@@ -483,7 +483,7 @@
 INFO_HOST_NAME_TOOLTIP=Enter the name of the host.
 INFO_HTML_SEPARATOR_COLOR=666666
 INFO_IMPORT_AUTOMATICALLY_GENERATED_LABEL=Import Automatically-Generated \
- Example Data
+ Sample Data
 INFO_IMPORT_AUTOMATICALLY_GENERATED_TOOLTIP=Populate the base DN with \
  automatically-generated LDAP data
 INFO_IMPORT_DATA_FROM_LDIF_LABEL=Import Data from LDIF File
@@ -520,6 +520,9 @@
 INFO_INSTALLANDUPGRADER_RBUPGRADE_LABEL=Upgrade Existing Server Instance
 INFO_INSTALLANDUPGRADER_RBUPGRADE_TOOLTIP=Select to upgrade an existing \
  server instance.
+INFO_INSTALLSTATUS_CANOVERWRITECURRENTINSTALL_MSG_CLI=The Directory Server \
+ contains some database files.%nThe setup will delete the contents of these \
+ database files.
 INFO_INSTALLSTATUS_CANOVERWRITECURRENTINSTALL_MSG=The Directory Server \
  contains some database files.<br>If you continue with the setup the contents \
  of these database files will be deleted.
@@ -528,6 +531,9 @@
 INFO_INSTALLSTATUS_INSTALLED=OpenDS Server Already Configured<br> QuickSetup \
  can only be used with OpenDS Servers that have not yet been configured.  The \
  current server:%s
+INFO_INSTALLSTATUS_INSTALLED_CLI=OpenDS Server Already Configured%n %s \
+ command-line can only be used with OpenDS Servers that have not yet been \
+ configured.  The current server:%s
 INFO_INSTALLSTATUS_NOT_INSTALLED=The Directory Server is not installed.
 INFO_INSTALLSTATUS_SERVERRUNNING=Is currently running on port %s
 INFO_INSTRUCTIONS_COLOR=000,000,000
@@ -555,9 +561,9 @@
 INFO_KEYSTORE_PATH_NOT_A_FILE=The provided key store path is not a file.
 INFO_KEYSTORE_PATH_NOT_PROVIDED=You must provide the path of the key store.
 INFO_KEYSTORE_PATH_TOOLTIP=Absolute path to the keystore.
-INFO_KEYSTORE_PWD_EMPTY=You must provide the password of the key store.
-INFO_KEYSTORE_PWD_LABEL=Key Store Password:
-INFO_KEYSTORE_PWD_TOOLTIP=Provide the password required to access the \
+INFO_KEYSTORE_PWD_EMPTY=You must provide the PIN of the key store.
+INFO_KEYSTORE_PWD_LABEL=Key Store PIN:
+INFO_KEYSTORE_PWD_TOOLTIP=Provide the PIN (password) required to access the \
  existing key store.
 INFO_KEYSTORE_TYPE_LABEL=Key Store Type:
 INFO_LDIF_FILE_DOES_NOT_EXIST=The provided LDIF file does not exist.
@@ -580,10 +586,10 @@
 INFO_NO_SUFFIXES_CHOSEN_TO_REPLICATE=You must select at least one base DN to \
  replicate contents with.
 INFO_NOT_A_BASE_DN=The provided Directory Base DN is not a valid DN.
-INFO_NOT_A_DIRECTORY_MANAGER_DN=The provided Administrative User DN is not a \
+INFO_NOT_A_DIRECTORY_MANAGER_DN=The provided Root User DN is not a \
  valid DN.
 INFO_NOT_A_DIRECTORY_MANAGER_IN_CONFIG=The provided DN is not one of the \
- Administrative User DN.
+ Root User DN.
 INFO_NOT_AVAILABLE_LABEL=<not available>
 INFO_NOT_ENOUGH_DISK_SPACE=There is not enough free disk space under %s.%nAt \
  least %s megabytes of free disk space are required to install OpenDS.
@@ -638,7 +644,7 @@
 INFO_PKCS12_CERTIFICATE_TOOLTIP=Select this option if you have a PKCS#12 \
  certificate.
 INFO_PKCS12_KEYSTORE_DOES_NOT_EXIST=No certificates for the PCKS#12 key store \
- could be found.  Check that the provided path and password are valid and that \
+ could be found.  Check that the provided path and PIN are valid and that \
  the key store contains certificates.
 INFO_PREVIOUS_BUTTON_LABEL=< Previous
 INFO_PREVIOUS_BUTTON_TOOLTIP=Go to Previous Step
@@ -653,6 +659,7 @@
 INFO_PROGRESS_CREATING_ADS_ON_REMOTE=Creating Registration Configuration on \
  %s
 INFO_PROGRESS_CREATING_BASE_ENTRY=Creating Base Entry %s
+INFO_PROGRESS_CREATING_BASE_ENTRIES=Creating Base Entry for the base DNs
 INFO_PROGRESS_DELETING_DIRECTORY=Deleting directory %s
 INFO_PROGRESS_DELETING_EXTERNAL_DB_FILES=Deleting Database Files outside the \
  Installation Path:
@@ -674,6 +681,7 @@
 INFO_PROGRESS_IMPORT_AUTOMATICALLY_GENERATED=Importing \
  Automatically-Generated Data (%s Entries):
 INFO_PROGRESS_IMPORTING_LDIF=Importing LDIF file %s:
+INFO_PROGRESS_IMPORTING_LDIFS=Importing LDIF files %s:
 INFO_PROGRESS_INITIALIZING_ADS=Initializing Registration information
 INFO_PROGRESS_INITIALIZING_SUFFIX=Initializing base DN %s with the contents \
  from %s:
@@ -693,7 +701,7 @@
 INFO_PROGRESS_UPDATING_CERTIFICATES=Configuring Certificates
 INFO_PROGRESSBAR_INITIAL_LABEL=Starting...
 INFO_PROGRESSBAR_TOOLTIP=Progress Bar
-INFO_PWD_TOO_SHORT=The minimum length required for the Administrative User \
+INFO_PWD_TOO_SHORT=The minimum length required for the Root User \
  password is %s characters.
 INFO_QUIT_BUTTON_INSTALL_TOOLTIP=Quit Setup
 INFO_QUIT_BUTTON_LABEL=Quit
@@ -795,15 +803,15 @@
  alias.
 INFO_SELECT_ALIAS_TITLE=OpenDS QuickSetup
 INFO_SELF_SIGNED_CERTIFICATE=Create a new Self-Signed Certificate
-INFO_SERVER_DIRECTORY_MANAGER_DN_LABEL=Administrative User DN:
+INFO_SERVER_DIRECTORY_MANAGER_DN_LABEL=Root User DN:
 INFO_SERVER_DIRECTORY_MANAGER_DN_TOOLTIP=Enter the distinguished name (DN) of \
- the Administrative User account that will used for managing OpenDS
+ the inital Root User account that will used for managing OpenDS
 INFO_SERVER_DIRECTORY_MANAGER_PWD_CONFIRM_LABEL=Password (confirm):
 INFO_SERVER_DIRECTORY_MANAGER_PWD_CONFIRM_TOOLTIP=Re-enter the password for \
- the OpenDS Administrative User account
+ the OpenDS inital Root User account
 INFO_SERVER_DIRECTORY_MANAGER_PWD_LABEL=Password:
 INFO_SERVER_DIRECTORY_MANAGER_PWD_TOOLTIP=Enter a password for the OpenDS \
- Administrative User account
+ inital Root User account
 INFO_SERVER_ERROR=Error on %s:
 INFO_SERVER_LOCATION_LABEL=Installation Path:
 INFO_SERVER_LOCATION_PARENT_TOOLTIP=Enter the full path to the parent \
@@ -823,7 +831,7 @@
 INFO_SERVER_SECURITY_TOOLTIP=The LDAP Secure Access Configuration for the new \
  OpenDS server.
 INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS=Enter a port to listen for LDAP \
- requests and enter a password for the OpenDS administrative user.
+ requests and enter a password for the OpenDS initial Root user.
 INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS_WEBSTART=Choose a location for the \
  server files and enter a password for the OpenDS administrative user.
 INFO_SERVER_SETTINGS_PANEL_TITLE=Server Settings

--
Gitblit v1.10.0