From 2095a28e3b117ddc7b565bc7fbe410af70cb48f4 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 31 Oct 2016 14:00:38 +0000
Subject: [PATCH] OPENDJ-2772 Align SDK client tool with server's
---
opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
index e296870..ee0c97b 100644
--- a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
+++ b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
@@ -40,7 +40,6 @@
ERR_DESCRIPTION_INVALID_VERSION=Invalid LDAP version number '%s'. \
Allowed values are 2 and 3
ERR_SEARCH_NO_FILTERS=No filters specified for the search request
-INFO_DESCRIPTION_DONT_WRAP=Do not wrap long lines
INFO_DESCRIPTION_TYPES_ONLY=Only retrieve attribute names but not their \
values
INFO_DESCRIPTION_ASSERTION_FILTER=Use the LDAP assertion control with the \
@@ -71,8 +70,7 @@
control be included in updated entries, or 0 to exclude the control from \
matching entries
INFO_BIND_AUTHZID_RETURNED=# Bound with authorization ID %s
-INFO_SEARCH_DESCRIPTION_FILENAME=File containing a list of search filter \
- strings
+INFO_SEARCH_DESCRIPTION_FILENAME=File containing the search filter to use
INFO_DESCRIPTION_MATCHED_VALUES_FILTER=Use the LDAP matched values \
control with the provided filter
ERR_LDAP_MATCHEDVALUES_INVALID_FILTER=The provided matched values \
@@ -125,7 +123,7 @@
LDAP compare operations in the Directory Server
INFO_LDAPMODIFY_TOOL_DESCRIPTION=This utility can be used to perform LDAP \
modify, add, delete, and modify DN operations in the Directory Server. \
- When not using a file to specify modifications, end your input with EOF \
+ When not using file(s) to specify modifications, end your input with EOF \
(Ctrl+D on UNIX, Ctrl+Z on Windows)
INFO_LDAPPWMOD_TOOL_DESCRIPTION=This utility can be used to perform LDAP \
password modify operations in the Directory Server
@@ -273,17 +271,24 @@
ERR_LDIFDIFF_MULTIPLE_USES_OF_STDIN=Unable to use stdin for both the source \
LDIF and target LDIF
ERR_LDIFMODIFY_PATCH_FAILED=The changes could not be applied for the following \
- reason: %s
+ reason: %s\nEnsure that no modification operations are done on previously \
+ added or deleted entries.
ERR_LDIFDIFF_DIFF_FAILED=The differences could not be computed for the following \
reason: %s
ERR_LDIFSEARCH_FAILED=The search could not be performed for the following \
reason: %s
INFO_LDIFMODIFY_TOOL_DESCRIPTION=This utility can be used to apply a set of \
- modify, add, and delete operations to entries contained in an LDIF file
+ modify, add, and delete operations to entries contained in an LDIF file.\n \
+ If standard input is used to specify source or changes, end your input with EOF \
+ (Ctrl+D on UNIX, Ctrl+Z on Windows)
INFO_LDIFDIFF_TOOL_DESCRIPTION=This utility can be used to compare two LDIF \
- files and report the differences in LDIF format
+ files and report the differences in LDIF format.\n \
+ If standard input is used to specify source or target, end your input with EOF \
+ (Ctrl+D on UNIX, Ctrl+Z on Windows)
INFO_LDIFSEARCH_TOOL_DESCRIPTION=This utility can be used to perform search \
- operations against entries contained in an LDIF file
+ operations against entries contained in an LDIF file.\n \
+ If standard input is used to specify source, end your input with EOF \
+ (Ctrl+D on UNIX, Ctrl+Z on Windows)
ERR_LDIF_GEN_TOOL_EXCEPTION_DURING_PARSE=An error occurred while \
parsing template file: %s
ERR_LDIF_GEN_TOOL_NO_SUCH_RESOURCE_DIRECTORY=The specified resource \
@@ -295,6 +300,18 @@
ERR_AUTHRATE_NO_BIND_DN_PROVIDED=Authentication information must be provided \
to use this tool
ERR_DECODE_CONTROL_CRITICALITY=Invalid format for criticality value '%s' in control '%s'
+INFO_LDAPCOMPARE_DESCRIPTION_FILENAME=File containing the DNs of the entries \
+ to compare
+INFO_DESCRIPTION_SUBENTRIES=Use subentries control to specify that \
+ subentries are visible and normal entries are not
+INFO_LDIFSEARCH_DESCRIPTION_BASEDN=The base DN for the search. If no base \
+ DN is provided, then the root DSE will be used
+INFO_LDIFDIFF_DESCRIPTION_USE_COMPARE_RESULT=Use the LDAP compare result \
+as an exit code for reporting differences between the two LDIF files
+INFO_LDAPCOMPARE_DESCRIPTION_USE_COMPARE_RESULT=Use the LDAP compare result \
+as an exit code for the LDAP compare operations
+INFO_LDIFDIFF_NO_DIFFERENCES=No differences were detected between the \
+ source and target LDIF files
#
# MakeLDIF tool
#
@@ -321,9 +338,6 @@
processing : %s
ERR_CONSTANT_ARG_CANNOT_DECODE=Unable to parse a constant argument \
expecting name=value but got %s
-INFO_MAKELDIF_DESCRIPTION_WRAP_COLUMN=Maximum length of an output line \
- (0 for no wrapping)
-INFO_MAKELDIF_WRAP_COLUMN_PLACEHOLDER={wrapColumn}
ERR_LDAPP_BIND_FAILED=The LDAP bind request failed: %d (%s)
ERR_LDAP_SEARCH_FAILED=The LDAP search request failed: %d (%s)
ERR_LDAP_MODIFY_FAILED=The LDAP modify request failed: %d (%s)
--
Gitblit v1.10.0