From 1e35b72a628e4ed9c4bbdd2412d13d006ee6dfce Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Thu, 06 Feb 2014 16:25:25 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1303 - Added ReturnCode class. - Added/Renamed common arguments. - Added messages.

---
 opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties
index de3f6f5..9656f31 100755
--- a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties
+++ b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties
@@ -544,6 +544,7 @@
 INFO_ROOT_USER_PWD_PLACEHOLDER={rootUserPassword}
 INFO_ROOT_USER_PWD_FILE_PLACEHOLDER={rootUserPasswordFile}
 INFO_HOST_PLACEHOLDER={host}
+INFO_TIMEOUT_PLACEHOLDER={timeout}
 INFO_GENERAL_DESCRIPTION_REJECTED_FILE=Write rejected entries to the \
  specified file
 INFO_GENERAL_DESCRIPTION_SKIPPED_FILE=Write skipped entries to the \
@@ -699,4 +700,18 @@
 INFO_BACKUPDB_DESCRIPTION_BACKEND_ID=Backend ID for the backend to \
  archive
 INFO_BACKUPDB_DESCRIPTION_BACKUP_ALL=Back up all backends in the server
- 
+INFO_SETUP_SUBCOMMAND_CREATE_DIRECTORY_SERVER=Can be used with global arguments \
+to setup a directory server
+INFO_SETUP_SUBCOMMAND_CREATE_PROXY=Can be used with global arguments \
+to setup a proxy
+ERR_INCOMPATIBLE_JAVA_VERSION=The minimum Java version required is %s.%n%n\
+ The detected version is %s.%nThe binary detected is %s%n%nPlease set \
+ OPENDJ_JAVA_HOME to the root of a compatible Java installation or edit the \
+ java.properties file and then run the dsjavaproperties script to specify the \
+ java version to be used.
+INFO_INSTANCE_DIRECTORY=Instance Directory:      %s
+INFO_INSTALLATION_DIRECTORY=Installation Directory:      %s
+ERR_INVALID_LOG_FILE=Invalid log file %s
+INFO_DESCRIPTION_CONNECTION_TIMEOUT=Maximum length of time (in \
+ milliseconds) that can be taken to establish a connection.  Use '0' to \
+ specify no time out

--
Gitblit v1.10.0