Fix CLI consistency issues: 1407 1408 1410 1411 1412 1413 1414 1416 1417 1...

lutoff

04.46.2007 61cfba9be6d79eb9cea135c86330dfcad9ed29d8

Fix CLI consistency 
issues: 1407 1408 1410 1411 1412 1413 1414 1416 1417 1418 1419 1420 1421

 opendj-sdk/opends/resource/bin/make-ldif

File was renamed from opendj-sdk/opends/resource/bin/makeldif
@@ -30,7 +30,7 @@
OPENDS_INVOKE_CLASS="org.opends.server.tools.makeldif.MakeLDIF"
export OPENDS_INVOKE_CLASS

SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=makeldif"
SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=make-ldif"
export SCRIPT_NAME_ARG

SCRIPT_DIR=`dirname "${0}"`

 opendj-sdk/opends/resource/bin/make-ldif.bat

File was renamed from opendj-sdk/opends/resource/bin/makeldif.bat
@@ -28,6 +28,6 @@
setlocal

set OPENDS_INVOKE_CLASS="org.opends.server.tools.makeldif.MakeLDIF"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=makeldif"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=make-ldif"
call "%~dP0\_server-script.bat" --resourcePath "%~dP0..\config\MakeLDIF" %*


 opendj-sdk/opends/resource/bin/status-panel

 opendj-sdk/opends/resource/bin/status-panel.bat

 opendj-sdk/opends/resource/bin/windows-service.bat

File was renamed from opendj-sdk/opends/resource/bin/windowsservice.bat
@@ -28,6 +28,6 @@
setlocal

set OPENDS_INVOKE_CLASS="org.opends.server.tools.ConfigureWindowsService"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=windowsservice"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=windows-service"
call "%~dP0\_client-script.bat" %*


 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties

@@ -35,69 +35,69 @@
Server.\n\Usage:  {0} {options}\n        where {options} include:\n\
--cli\n\    Specifies to use the command line setup.  If not specified the \
graphical\n\    interface will be launched.\n\
-H  or   --help\n    Displays usage information for this program.\n\n\
-H , --help\n    Display this usage information.\n\n\
The following options will only be taken into account if the option --cli \n\
(command line) is specified\n\
-s  or   --silentInstall\n    Perform a silent installation.\n\
-b {baseDN}  or   --baseDN {baseDN}\n\    Specifies the base DN for user \
-s, --silentInstall\n    Perform a silent installation.\n\
-b, --baseDN {baseDN}\n\    Specifies the base DN for user \
information in the Directory Server.\n    Multiple base DNs may be provided by \
using this option multiple times.\n\
-a  or   --addBaseEntry\n    Indicates whether to create the base entry in the \
-a, --addBaseEntry\n    Indicates whether to create the base entry in the \
Directory Server\n    database.\n\
-i {ldifFile}  or   --importLDIF {ldifFile}\n    Specifies the path to an LDIF \
-l, --ldifFile {ldifFile}\n    Specifies the path to an LDIF \
file containing data that should be added to\n    the Directory Server \
database.  Multiple LDIF files may be provided by\n    using this option \
multiple times.\n\
-d {numEntries}  or   --sampleData {numEntries}\n    Specifies that the \
-d {numEntries}, --sampleData {numEntries}\n    Specifies that the \
database should be populated with the specified number\n\    of sample \
entries.\n\
-p {port}  or   --ldapPort {port}\n    Specifies the port on which the \
-p, --ldapPort {port}\n    Specifies the port on which the \
Directory Server should listen for LDAP\n    communication.\n\
-j {jmxPort}  or   --jmxPort {jmxPort}\n    Specifies the port on which the \
-x, --jmxPort {jmxPort}\n    Specifies the port on which the \
Directory Server should listen for JMX\n    communication.\n\
-S  or   --skipPortCheck\n    Skip the check to determine whether the \
-S , --skipPortCheck\n    Skip the check to determine whether the \
specified LDAP port is usable.\n\
-D {rootDN}  or   --rootUserDN {rootDN}\n    Specifies the DN for the initial \
-D, --rootUserDN {rootUserDN}\n    Specifies the DN for the initial \
Administrative User for the Directory Server.\n\
-w {password}  or   --rootUserPassword {password}\n    Specifies the password \
-w, --rootUserPassword {password}\n    Specifies the password \
for the initial Administrative User for the Directory Server.\n\
-W {filename}  or   --rootUserPasswordFile {filename}\n    Specifies the path \
-j , --rootUserPasswordFile {filename}\n    Specifies the path \
to a file containing the password for the initial Administrative\n\    User \
for the Directory Server.
setup-launcher-usage-windows=This utility may be used to setup the Directory \
Server.\n\Usage:  {0} {options}\n        where {options} include:\n\
--cli\n\    Specifies to use the command line setup.  If not specified the \
graphical\n\    interface will be launched.\n\
-H  or   --help\n    Displays usage information for this program.\n\n\
-H, --help\n    Display this usage information.\n\n\
The following options will only be taken into account if the option --cli \n\
(command line) is specified\n\
-s  or   --silentInstall\n    Perform a silent installation.\n\
-b {baseDN}  or   --baseDN {baseDN}\n\    Specifies the base DN for user \
-s, -silentInstall\n    Perform a silent installation.\n\
-b {baseDN}, --baseDN {baseDN}\n\    Specifies the base DN for user \
information in the Directory Server.\n    Multiple base DNs may be provided by \
using this option multiple times.\n\
-a  or   --addBaseEntry\n    Indicates whether to create the base entry in the \
-a, --addBaseEntry\n    Indicates whether to create the base entry in the \
Directory Server\n    database.\n\
-i {ldifFile}  or   --importLDIF {ldifFile}\n    Specifies the path to an LDIF \
-l, --ldifFile {ldifFile}\n    Specifies the path to an LDIF \
file containing data that should be added to\n    the Directory Server \
database.  Multiple LDIF files may be provided by\n    using this option \
multiple times.\n\
-d {numEntries}  or   --sampleData {numEntries}\n    Specifies that the \
-d, --sampleData {numEntries}\n    Specifies that the \
database should be populated with the specified number\n\    of sample \
entries.\n\
-p {port}  or   --ldapPort {port}\n    Specifies the port on which the \
-p, --ldapPort {port}\n    Specifies the port on which the \
Directory Server should listen for LDAP\n    communication.\n\
-j {jmxPort}  or   --jmxPort {jmxPort}\n    Specifies the port on which the \
-x, --jmxPort {jmxPort}\n    Specifies the port on which the \
Directory Server should listen for JMX\n    communication.\n\
-S  or   --skipPortCheck\n    Skip the check to determine whether the \
-S, --skipPortCheck\n    Skip the check to determine whether the \
specified LDAP port is usable.\n\
-D {rootDN}  or   --rootUserDN {rootDN}\n    Specifies the DN for the initial \
-D, --rootUserDN {rootUserDN}\n    Specifies the DN for the initial \
Administrative User for the Directory Server.\n\
-w {password}  or   --rootUserPassword {password}\n    Specifies the password \
-w, --rootUserPassword {password}\n    Specifies the password \
for the initial Administrative User for the Directory Server.\n\
-W {filename}  or   --rootUserPasswordFile {filename}\n    Specifies the path \
-j, --rootUserPasswordFile {filename}\n    Specifies the path \
to a file containing the password for the initial Administrative\n\    User \
for the Directory Server.\n\
-n or --noWindowsService\n    Do not enable OpenDS to run as a Windows \
-n, --noWindowsService\n    Do not enable OpenDS to run as a Windows \
Service.
setup-launcher-launching-gui=Launching graphical setup...
setup-launcher-gui-launched-failed=\n\nThe graphical Setup launch failed.\n\n\
@@ -111,10 +111,10 @@
Usage:  {0} {options}\n        where {options} include:\n\
--cli\n\    Specifies to use the command line uninstall.  If not specified the \
graphical\n\    interface will be launched.\n\
-H  or   --help\n    Displays usage information for this program.\n\n\
-H, --help\n    Display this usage information.\n\n\
The following options will only be taken into account if the option --cli \n\
(command line) is specified\n\
-s  or   --silentUninstall\n    Perform a silent uninstall.
-s, --silentUninstall\n    Perform a silent uninstall.
uninstall-launcher-launching-gui=Launching graphical uninstall...
uninstall-launcher-launching-cli=Launching command line uninstall...
uninstall-launcher-gui-launched-failed=\n\nThe graphical Uninstall launch \
@@ -162,10 +162,10 @@
Usage:  {0} {options}\n        where {options} include:\n\
--cli\n\    Specifies to use the command line upgrade.  If not specified the \
graphical\n\    interface will be launched.\n\
-H  or   --help\n    Displays usage information for this program.\n\n\
-H, --help\n    Displays usage information for this program.\n\n\
The following options will only be taken into account if the option --cli \n\
(command line) is specified\n\
-s  or   --silentUpgrade\n    Perform a silent upgrade.
-s, --silentUpgrade\n    Perform a silent upgrade.
upgrade-launcher-launching-gui=Launching graphical upgrade...
upgrade-launcher-launching-cli=Launching command line upgrade...
upgrade-launcher-gui-launched-failed=\n\nThe graphical upgrade launch \

 opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java

@@ -8410,12 +8410,12 @@
      argParser.addArgument(windowsNetStart);


      version = new BooleanArgument("version", 'v', "version",
      version = new BooleanArgument("version", 'V', "version",
                                    MSGID_DSCORE_DESCRIPTION_VERSION);
      argParser.addArgument(version);


      fullVersion = new BooleanArgument("fullversion", 'V', "fullVersion",
      fullVersion = new BooleanArgument("fullversion", 'F', "fullVersion",
                                        MSGID_DSCORE_DESCRIPTION_FULLVERSION);
      fullVersion.setHidden(true);
      argParser.addArgument(fullVersion);

 opendj-sdk/opends/src/server/org/opends/server/messages/ToolMessages.java

@@ -8122,7 +8122,7 @@
    registerMessage(MSGID_LDIFEXPORT_DESCRIPTION_SIGN_HASH,
                    "Generate a signed hash of the export data");
    registerMessage(MSGID_LDIFEXPORT_DESCRIPTION_USAGE,
                    "Display this usage information");
                    "Display this usage information.");
    registerMessage(MSGID_LDIFEXPORT_CANNOT_INITIALIZE_ARGS,
                    "An unexpected error occurred while attempting to " +
                    "initialize the command-line arguments:  %s.");
@@ -8398,9 +8398,9 @@
    registerMessage(MSGID_DESCRIPTION_TRUSTALL,
                    "Trust all server SSL certificates");
    registerMessage(MSGID_DESCRIPTION_BINDDN,
                    "Bind DN");
                    "Specifies the DN to use to bind to the server.");
    registerMessage(MSGID_DESCRIPTION_BINDPASSWORD,
                    "Bind password");
                    "Specifies the password to use to bind to the server");
    registerMessage(MSGID_DESCRIPTION_BINDPASSWORDFILE,
                    "Bind password file");
    registerMessage(MSGID_DESCRIPTION_PROXY_AUTHZID,
@@ -8451,7 +8451,7 @@
    registerMessage(MSGID_DESCRIPTION_VERSION,
                    "LDAP protocol version number");
    registerMessage(MSGID_DESCRIPTION_SHOWUSAGE,
                    "Display this usage information");
                    "Display this usage information.");
    registerMessage(MSGID_DESCRIPTION_CONTROLS,
                    "Use a request control with the provided information");
    registerMessage(MSGID_DESCRIPTION_CONTINUE_ON_ERROR,
@@ -8919,7 +8919,7 @@
    registerMessage(MSGID_BACKUPDB_DESCRIPTION_SIGN_HASH,
                    "Sign the hash of the backup contents");
    registerMessage(MSGID_BACKUPDB_DESCRIPTION_USAGE,
                    "Display this usage information");
                    "Display this usage information.");
    registerMessage(MSGID_BACKUPDB_CANNOT_INITIALIZE_ARGS,
                    "An unexpected error occurred while attempting to " +
                    "initialize the command-line arguments:  %s.");
@@ -9050,7 +9050,7 @@
    registerMessage(MSGID_RESTOREDB_DESCRIPTION_VERIFY_ONLY,
                    "Verify the contents of the backup but do not restore it");
    registerMessage(MSGID_RESTOREDB_DESCRIPTION_USAGE,
                    "Display this usage information");
                    "Display this usage information.");
    registerMessage(MSGID_RESTOREDB_CANNOT_INITIALIZE_ARGS,
                    "An unexpected error occurred while attempting to " +
                    "initialize the command-line arguments:  %s.");
@@ -9169,9 +9169,9 @@
    registerMessage(MSGID_STOPDS_DESCRIPTION_USESTARTTLS,
                    "Use StartTLS for secure communication with the server");
    registerMessage(MSGID_STOPDS_DESCRIPTION_BINDDN,
                    "Bind DN");
                    "Specifies the DN to use to bind to the server.");
    registerMessage(MSGID_STOPDS_DESCRIPTION_BINDPW,
                    "Bind password");
                    "Specifies the password to use to bind to the server.");
    registerMessage(MSGID_STOPDS_DESCRIPTION_BINDPWFILE,
                    "Bind password file");
    registerMessage(MSGID_STOPDS_DESCRIPTION_SASLOPTIONS,
@@ -9385,7 +9385,7 @@
                    "not provided, then a default of " +
                    ConfigFileHandler.class.getName() + " will be used.");
    registerMessage(MSGID_LDIFDIFF_DESCRIPTION_USAGE,
                    "Displays usage information for this program.");
                    "Display this usage information.");
    registerMessage(MSGID_LDIFDIFF_CANNOT_INITIALIZE_ARGS,
                    "An unexpected error occurred while attempting to " +
                    "initialize the command-line arguments:  %s.");
@@ -9453,7 +9453,7 @@
                    "Specifies the path to a file containing the password " +
                    "for the initial root user for the Directory Server.");
    registerMessage(MSGID_CONFIGDS_DESCRIPTION_USAGE,
                    "Displays usage information for this program.");
                    "Display this usage information.");
    registerMessage(MSGID_CONFIGDS_CANNOT_INITIALIZE_ARGS,
                    "An unexpected error occurred while attempting to " +
                    "initialize the command-line arguments:  %s.");
@@ -9559,7 +9559,7 @@
    registerMessage(MSGID_INSTALLDS_DESCRIPTION_NO_WINDOWS_SERVICE,
                    "Do not enable OpenDS to run as a Windows Service.");
    registerMessage(MSGID_INSTALLDS_DESCRIPTION_HELP,
                    "Displays usage information for this program.");
                    "Display this usage information.");
    registerMessage(MSGID_INSTALLDS_NO_CONFIG_FILE,
                    "ERROR:  No configuration file path was provided (use " +
                    "the %s argument).");
@@ -9854,7 +9854,7 @@
                    "The seed to use to initialize the random number " +
                    "generator.");
    registerMessage(MSGID_MAKELDIF_DESCRIPTION_HELP,
                    "Show this usage information.");
                    "Display this usage information.");
    registerMessage(MSGID_MAKELDIF_CANNOT_INITIALIZE_ARGS,
                    "An unexpected error occurred while attempting to " +
                    "initialize the command-line arguments:  %s.");
@@ -10058,7 +10058,7 @@
                    "The path to a file containing the PIN needed to access" +
                    "the contents of the trust store.");
    registerMessage(MSGID_LDAPPWMOD_DESCRIPTION_USAGE,
                    "Show this usage information.");
                    "Display this usage information.");
    registerMessage(MSGID_LDAPPWMOD_CANNOT_INITIALIZE_ARGS,
                    "An unexpected error occurred while attempting to " +
                    "initialize the command-line arguments:  %s.");

 opendj-sdk/opends/src/server/org/opends/server/tools/BackUpDB.java

@@ -66,6 +66,7 @@
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;



@@ -145,8 +146,9 @@
    try
    {
      configClass =
           new StringArgument("configclass", 'C', "configClass", true, false,
                              true, "{configClass}",
           new StringArgument("configclass", OPTION_SHORT_CONFIG_CLASS,
                              OPTION_LONG_CONFIG_CLASS, true, false,
                              true, OPTION_VALUE_CONFIG_CLASS,
                              ConfigFileHandler.class.getName(), null,
                              MSGID_BACKUPDB_DESCRIPTION_CONFIG_CLASS);
      configClass.setHidden(true);
@@ -199,7 +201,8 @@
      argParser.addArgument(incrementalBaseID);


      compress = new BooleanArgument("compress", 'c', "compress",
      compress = new BooleanArgument("compress", OPTION_SHORT_COMPRESS,
                                     OPTION_LONG_COMPRESS,
                                     MSGID_BACKUPDB_DESCRIPTION_COMPRESS);
      argParser.addArgument(compress);

@@ -221,7 +224,8 @@


      displayUsage =
           new BooleanArgument("help", 'H', "help",
           new BooleanArgument("help", OPTION_SHORT_HELP,
                               OPTION_LONG_HELP,
                               MSGID_BACKUPDB_DESCRIPTION_USAGE);
      argParser.addArgument(displayUsage);
      argParser.setUsageArgument(displayUsage);

 opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureDS.java

@@ -57,6 +57,7 @@
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;



@@ -166,49 +167,57 @@
      configFile.setHidden(true);
      argParser.addArgument(configFile);

      configClass = new StringArgument("configclass", 'C', "configClass", false,
                             false, true, "{configClass}",
      configClass = new StringArgument("configclass", OPTION_SHORT_CONFIG_CLASS,
                             OPTION_LONG_CONFIG_CLASS, false,
                             false, true, OPTION_VALUE_CONFIG_CLASS,
                             ConfigFileHandler.class.getName(), null,
                             MSGID_CONFIGDS_DESCRIPTION_CONFIG_CLASS);
      configClass.setHidden(true);
      argParser.addArgument(configClass);

      ldapPort = new IntegerArgument("ldapport", 'p', "ldapPort", false, false,
      ldapPort = new IntegerArgument("ldapport", OPTION_SHORT_PORT,
                                    "ldapPort", false, false,
                                     true, "{ldapPort}", 389, null, true, 1,
                                     true, 65535,
                                     MSGID_CONFIGDS_DESCRIPTION_LDAP_PORT);
      argParser.addArgument(ldapPort);

      jmxPort = new IntegerArgument("jmxport", 'j', "jmxPort", false, false,
      jmxPort = new IntegerArgument("jmxport", 'x', "jmxPort", false, false,
          true, "{jmxPort}", SetupUtils.getDefaultJMXPort(), null, true, 1,
          true, 65535,
          MSGID_CONFIGDS_DESCRIPTION_JMX_PORT);
      argParser.addArgument(jmxPort);

      baseDNString = new StringArgument("basedn", 'b', "baseDN", false, true,
                                        true, "{baseDN}", "dc=example,dc=com",
      baseDNString = new StringArgument("basedn", OPTION_SHORT_BASEDN,
                                        OPTION_LONG_BASEDN, false, true,
                                        true, OPTION_VALUE_BASEDN,
                                        "dc=example,dc=com",
                                        null,
                                        MSGID_CONFIGDS_DESCRIPTION_BASE_DN);
      argParser.addArgument(baseDNString);

      rootDNString = new StringArgument("rootdn", 'D', "rootDN", false, false,
                                        true, "{rootUserDN}",
      rootDNString = new StringArgument("rootdn", OPTION_SHORT_ROOT_USER_DN,
                                        OPTION_LONG_ROOT_USER_DN, false, false,
                                        true, OPTION_VALUE_ROOT_USER_DN,
                                        "cn=Directory Manager", null,
                                        MSGID_CONFIGDS_DESCRIPTION_ROOT_DN);
      argParser.addArgument(rootDNString);

      rootPassword = new StringArgument("rootpw", 'w', "rootPassword", false,
      rootPassword = new StringArgument("rootpw", OPTION_SHORT_BINDPWD,
                                        "rootPassword", false,
                                        false, true, "{rootUserPW}", null, null,
                                        MSGID_CONFIGDS_DESCRIPTION_ROOT_PW);
      argParser.addArgument(rootPassword);

      rootPasswordFile = new FileBasedArgument("rootpwfile", 'W',
      rootPasswordFile = new FileBasedArgument("rootpwfile",
                                  OPTION_SHORT_BINDPWD_FILE,
                                  "rootPasswordFile", false, false,
                                  "{filename}", null, null,
                                  MSGID_CONFIGDS_DESCRIPTION_ROOT_PW_FILE);
      argParser.addArgument(rootPasswordFile);

      showUsage = new BooleanArgument("showusage", 'H', "help",
      showUsage = new BooleanArgument("showusage", OPTION_SHORT_HELP,
                                      OPTION_LONG_HELP,
                                      MSGID_CONFIGDS_DESCRIPTION_USAGE);
      argParser.addArgument(showUsage);
      argParser.setUsageArgument(showUsage);

 opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureWindowsService.java

@@ -45,6 +45,7 @@
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.MAX_LINE_WIDTH;
import static org.opends.server.util.StaticUtils.wrapText;
import static org.opends.server.tools.ToolConstants.*;

/**
  * This class is used to configure the Windows service for this instance on
@@ -220,7 +221,8 @@
          MSGID_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_CLEANUP);
      argParser.addArgument(cleanupService);

      showUsage = new BooleanArgument("showusage", 'H', "help",
      showUsage = new BooleanArgument("showusage", OPTION_SHORT_HELP,
          OPTION_LONG_HELP,
          MSGID_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_SHOWUSAGE);
      argParser.addArgument(showUsage);
      argParser.setUsageArgument(showUsage, out);

 opendj-sdk/opends/src/server/org/opends/server/tools/EncodePassword.java

@@ -54,11 +54,11 @@
import org.opends.server.util.args.FileBasedArgument;
import org.opends.server.util.args.StringArgument;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;



@@ -178,7 +178,7 @@


      clearPasswordFile =
           new FileBasedArgument("clearpwfile", 'F', "clearPasswordFile", false,
           new FileBasedArgument("clearpwfile", 'f', "clearPasswordFile", false,
                                 false, "{filename}", null, null,
                                 MSGID_ENCPW_DESCRIPTION_CLEAR_PW_FILE);
      argParser.addArgument(clearPasswordFile);
@@ -198,15 +198,17 @@
      argParser.addArgument(encodedPasswordFile);


      configClass = new StringArgument("configclass", 'C', "configClass",
                                       true, false, true, "{configClass}",
      configClass = new StringArgument("configclass", OPTION_SHORT_CONFIG_CLASS,
                                       OPTION_LONG_CONFIG_CLASS,
                                       true, false, true,
                                       OPTION_VALUE_CONFIG_CLASS,
                                       ConfigFileHandler.class.getName(), null,
                                       MSGID_ENCPW_DESCRIPTION_CONFIG_CLASS);
      configClass.setHidden(true);
      argParser.addArgument(configClass);


      configFile = new StringArgument("configfile", 'f', "configFile",
      configFile = new StringArgument("configfile", 'F', "configFile",
                                      true, false, true, "{configFile}", null,
                                      null,
                                      MSGID_ENCPW_DESCRIPTION_CONFIG_FILE);
@@ -233,7 +235,8 @@
      argParser.addArgument(useCompareResultCode);


      showUsage = new BooleanArgument("usage", 'H', "help",
      showUsage = new BooleanArgument("usage", OPTION_SHORT_HELP,
                                      OPTION_LONG_HELP,
                                      MSGID_ENCPW_DESCRIPTION_USAGE);
      argParser.addArgument(showUsage);
      argParser.setUsageArgument(showUsage, out);

 opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java

@@ -65,6 +65,7 @@
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;



@@ -147,8 +148,9 @@
    try
    {
      configClass =
           new StringArgument("configclass", 'C', "configClass", true, false,
                              true, "{configClass}",
           new StringArgument("configclass", OPTION_SHORT_CONFIG_CLASS,
                              OPTION_LONG_CONFIG_CLASS, true, false,
                              true, OPTION_VALUE_CONFIG_CLASS,
                              ConfigFileHandler.class.getName(), null,
                              MSGID_LDIFEXPORT_DESCRIPTION_CONFIG_CLASS);
      configClass.setHidden(true);
@@ -164,8 +166,9 @@


      ldifFile =
           new StringArgument("ldiffile", 'l', "ldifFile", true, false, true,
                              "{ldifFile}", null, null,
           new StringArgument("ldiffile", OPTION_SHORT_LDIF_FILE,
                              OPTION_LONG_LDIF_FILE,true, false, true,
                              OPTION_VALUE_LDIF_FILE, null, null,
                              MSGID_LDIFEXPORT_DESCRIPTION_LDIF_FILE);
      argParser.addArgument(ldifFile);

@@ -239,7 +242,8 @@


      compressLDIF =
           new BooleanArgument("compressldif", 'c', "compressLDIF",
           new BooleanArgument("compressldif", OPTION_SHORT_COMPRESS,
                               OPTION_LONG_COMPRESS,
                               MSGID_LDIFEXPORT_DESCRIPTION_COMPRESS_LDIF);
      argParser.addArgument(compressLDIF);

@@ -257,7 +261,8 @@


      displayUsage =
           new BooleanArgument("help", 'H', "help",
           new BooleanArgument("help", OPTION_SHORT_HELP,
                               OPTION_LONG_HELP,
                               MSGID_LDIFEXPORT_DESCRIPTION_USAGE);
      argParser.addArgument(displayUsage);
      argParser.setUsageArgument(displayUsage);

 opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java

@@ -68,6 +68,7 @@
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;



@@ -162,8 +163,9 @@
    try
    {
      configClass =
           new StringArgument("configclass", 'C', "configClass", true, false,
                              true, "{configClass}",
           new StringArgument("configclass", OPTION_SHORT_CONFIG_CLASS,
                              OPTION_LONG_CONFIG_CLASS, true, false,
                              true, OPTION_VALUE_CONFIG_CLASS,
                              ConfigFileHandler.class.getName(), null,
                              MSGID_LDIFIMPORT_DESCRIPTION_CONFIG_CLASS);
      configClass.setHidden(true);
@@ -179,8 +181,9 @@


      ldifFiles =
           new StringArgument("ldiffile", 'l', "ldifFile", false, true, true,
                              "{ldifFile}", null, null,
           new StringArgument("ldiffile", OPTION_SHORT_LDIF_FILE,
                              OPTION_LONG_LDIF_FILE, false, true, true,
                              OPTION_VALUE_LDIF_FILE, null, null,
                              MSGID_LDIFIMPORT_DESCRIPTION_LDIF_FILE);
      argParser.addArgument(ldifFiles);

@@ -267,14 +270,16 @@


      randomSeed =
           new IntegerArgument("randomseed", 'S', "randomSeed", false, false,
                               true, "{seed}", 0, null, false, 0, false, 0,
           new IntegerArgument("randomseed", OPTION_SHORT_RANDOM_SEED,
                               OPTION_LONG_RANDOM_SEED, false, false,
                               true, OPTION_VALUE_RANDOM_SEED,
                               0, null, false, 0, false, 0,
                               MSGID_LDIFIMPORT_DESCRIPTION_RANDOM_SEED);
      argParser.addArgument(randomSeed);


      skipSchemaValidation =
           new BooleanArgument("skipschema", 's', "skipSchemaValidation",
           new BooleanArgument("skipschema", 'S', "skipSchemaValidation",
                    MSGID_LDIFIMPORT_DESCRIPTION_SKIP_SCHEMA_VALIDATION);
      argParser.addArgument(skipSchemaValidation);

@@ -297,7 +302,7 @@


      displayUsage =
           new BooleanArgument("help", 'H', "help",
           new BooleanArgument("help", OPTION_SHORT_HELP, OPTION_LONG_HELP,
                               MSGID_LDIFIMPORT_DESCRIPTION_USAGE);
      argParser.addArgument(displayUsage);
      argParser.setUsageArgument(displayUsage);

 opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java

@@ -53,6 +53,7 @@
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;



@@ -209,8 +210,9 @@
      configFile.setHidden(true);
      argParser.addArgument(configFile);

      configClass = new StringArgument("configclass", 'C', "configClass", false,
                             false, true, "{configClass}",
      configClass = new StringArgument("configclass", OPTION_SHORT_CONFIG_CLASS,
                             OPTION_LONG_CONFIG_CLASS, false,
                             false, true, OPTION_VALUE_CONFIG_CLASS,
                             ConfigFileHandler.class.getName(), null,
                             MSGID_INSTALLDS_DESCRIPTION_CONFIG_CLASS);
      configClass.setHidden(true);
@@ -218,7 +220,7 @@

      // NOTE:  This argument isn't actually used for anything, but it provides
      // consistency with the setup script, which does take a --cli option.
      cliMode = new BooleanArgument("cli", null, "cli",
      cliMode = new BooleanArgument("cli", null, OPTION_LONG_CLI,
                                    MSGID_INSTALLDS_DESCRIPTION_CLI);
      argParser.addArgument(cliMode);

@@ -226,8 +228,10 @@
                                          MSGID_INSTALLDS_DESCRIPTION_SILENT);
      argParser.addArgument(silentInstall);

      baseDN = new StringArgument("basedn", 'b', "baseDN", false, true, true,
                                  "{baseDN}", "dc=example,dc=com", null,
      baseDN = new StringArgument("basedn", OPTION_SHORT_BASEDN,
                                  OPTION_LONG_BASEDN, false, true, true,
                                  OPTION_VALUE_BASEDN,
                                  "dc=example,dc=com", null,
                                  MSGID_INSTALLDS_DESCRIPTION_BASEDN);
      argParser.addArgument(baseDN);

@@ -235,8 +239,10 @@
                                         MSGID_INSTALLDS_DESCRIPTION_ADDBASE);
      argParser.addArgument(addBaseEntry);

      importLDIF = new StringArgument("importldif", 'i', "importLDIF", false,
                                      true, true, "{ldifFile}", null, null,
      importLDIF = new StringArgument("importldif", OPTION_SHORT_LDIF_FILE,
                                      OPTION_LONG_LDIF_FILE, false,
                                      true, true, OPTION_VALUE_LDIF_FILE,
                                      null, null,
                                      MSGID_INSTALLDS_DESCRIPTION_IMPORTLDIF);
      argParser.addArgument(importLDIF);

@@ -246,13 +252,14 @@
                                       MSGID_INSTALLDS_DESCRIPTION_SAMPLE_DATA);
      argParser.addArgument(sampleData);

      ldapPort = new IntegerArgument("ldapport", 'p', "ldapPort", false, false,
                                     true, "{port}", 389, null, true, 1, true,
                                     65535,
      ldapPort = new IntegerArgument("ldapport", OPTION_SHORT_PORT,
                                     "ldapPort", false, false,
                                     true, OPTION_VALUE_PORT, 389,
                                     null, true, 1, true, 65535,
                                     MSGID_INSTALLDS_DESCRIPTION_LDAPPORT);
      argParser.addArgument(ldapPort);

      jmxPort = new IntegerArgument("jmxport", 'j', "jmxPort", false, false,
      jmxPort = new IntegerArgument("jmxport", 'x', "jmxPort", false, false,
                                    true, "{jmxPort}",
                                    SetupUtils.getDefaultJMXPort(), null, true,
                                    1, true, 65535,
@@ -263,19 +270,25 @@
                                          MSGID_INSTALLDS_DESCRIPTION_SKIPPORT);
      argParser.addArgument(skipPortCheck);

      rootDN = new StringArgument("rootdn", 'D', "rootUserDN", false, true,
                                  true, "{rootDN}", "cn=Directory Manager",
      rootDN = new StringArgument("rootdn",OPTION_SHORT_ROOT_USER_DN,
                                  OPTION_LONG_ROOT_USER_DN, false, true,
                                  true, OPTION_VALUE_ROOT_USER_DN,
                                  "cn=Directory Manager",
                                  null, MSGID_INSTALLDS_DESCRIPTION_ROOTDN);
      argParser.addArgument(rootDN);

      rootPWString = new StringArgument("rootpwstring", 'w', "rootUserPassword",
                                        false, false, true, "{password}", null,
      rootPWString = new StringArgument("rootpwstring", OPTION_SHORT_BINDPWD,
                                        "rootUserPassword",
                                        false, false, true,
                                        "{password}", null,
                                        null,
                                        MSGID_INSTALLDS_DESCRIPTION_ROOTPW);
      argParser.addArgument(rootPWString);

      rootPWFile = new FileBasedArgument("rootpwfile", 'W',
                            "rootUserPasswordFile", false, false, "{filename}",
      rootPWFile = new FileBasedArgument("rootpwfile",
                            OPTION_SHORT_BINDPWD_FILE,
                            "rootUserPasswordFile", false, false,
                            OPTION_VALUE_BINDPWD_FILE,
                            null, null, MSGID_INSTALLDS_DESCRIPTION_ROOTPWFILE);
      argParser.addArgument(rootPWFile);

@@ -287,7 +300,8 @@
        argParser.addArgument(noWindowsService);
      }

      showUsage = new BooleanArgument("help", 'H', "help",
      showUsage = new BooleanArgument("help", OPTION_SHORT_HELP,
                                      OPTION_LONG_HELP,
                                      MSGID_INSTALLDS_DESCRIPTION_HELP);
      argParser.addArgument(showUsage);
      argParser.setUsageArgument(showUsage);

 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java

@@ -68,6 +68,7 @@
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;


/**
@@ -376,42 +377,54 @@

    try
    {
      hostName = new StringArgument("host", 'h', "host", false, false, true,
                                    "{host}", "localhost", null,
      hostName = new StringArgument("host", OPTION_SHORT_HOST,
                                    OPTION_LONG_HOST, false, false, true,
                                    OPTION_VALUE_HOST, "localhost", null,
                                    MSGID_DESCRIPTION_HOST);
      argParser.addArgument(hostName);

      port = new IntegerArgument("port", 'p', "port", false, false, true,
                                 "{port}", 389, null, MSGID_DESCRIPTION_PORT);
      port = new IntegerArgument("port", OPTION_SHORT_PORT,
                                 OPTION_LONG_PORT, false, false, true,
                                 OPTION_VALUE_PORT, 389, null,
                                 MSGID_DESCRIPTION_PORT);
      argParser.addArgument(port);

      useSSL = new BooleanArgument("useSSL", 'Z', "useSSL",
      useSSL = new BooleanArgument("useSSL", OPTION_SHORT_USE_SSL,
                                   OPTION_LONG_USE_SSL,
                                   MSGID_DESCRIPTION_USE_SSL);
      argParser.addArgument(useSSL);

      startTLS = new BooleanArgument("startTLS", 'q', "startTLS",
      startTLS = new BooleanArgument("startTLS", OPTION_SHORT_START_TLS,
                                     OPTION_LONG_START_TLS,
                                     MSGID_DESCRIPTION_START_TLS);
      argParser.addArgument(startTLS);

      bindDN = new StringArgument("bindDN", 'D', "bindDN", false, false, true,
                                  "{bindDN}", null, null,
      bindDN = new StringArgument("bindDN", OPTION_SHORT_BINDDN,
                                  OPTION_LONG_BINDDN, false, false, true,
                                  OPTION_VALUE_BINDDN, null, null,
                                  MSGID_DESCRIPTION_BINDDN);
      argParser.addArgument(bindDN);

      bindPassword = new StringArgument("bindPassword", 'w', "bindPassword",
                                        false, false, true, "{bindPassword}",
      bindPassword = new StringArgument("bindPassword", OPTION_SHORT_BINDPWD,
                                        OPTION_LONG_BINDPWD,
                                        false, false, true,
                                        OPTION_VALUE_BINDPWD,
                                        null, null,
                                        MSGID_DESCRIPTION_BINDPASSWORD);
      argParser.addArgument(bindPassword);

      bindPasswordFile =
           new FileBasedArgument("bindPasswordFile", 'j',"bindPasswordFile",
                                 false, false, "{bindPasswordFilename}", null,
           new FileBasedArgument("bindPasswordFile",
                                 OPTION_SHORT_BINDPWD_FILE,
                                 OPTION_LONG_BINDPWD_FILE,
                                 false, false,
                                 OPTION_VALUE_BINDPWD_FILE, null,
                                 null, MSGID_DESCRIPTION_BINDPASSWORDFILE);
      argParser.addArgument(bindPasswordFile);

      filename = new StringArgument("filename", 'f', "filename", false, false,
                                    true, "{filename}", null, null,
      filename = new StringArgument("filename", OPTION_SHORT_FILENAME,
                                    OPTION_LONG_FILENAME, false, false,
                                    true, OPTION_VALUE_FILENAME, null, null,
                                    MSGID_COMPARE_DESCRIPTION_FILENAME);
      argParser.addArgument(filename);

@@ -420,8 +433,10 @@
                                         MSGID_DESCRIPTION_USE_SASL_EXTERNAL);
      argParser.addArgument(saslExternal);

      saslOptions = new StringArgument("saslOption", 'o', "saslOption", false,
                                       true, true, "{name=value}", null, null,
      saslOptions = new StringArgument("saslOption", OPTION_SHORT_SASLOPTION,
                                       OPTION_LONG_SASLOPTION, false,
                                       true, true,
                                       OPTION_VALUE_SASLOPTION, null, null,
                                       MSGID_DESCRIPTION_SASL_PROPERTIES);
      argParser.addArgument(saslOptions);

@@ -429,21 +444,28 @@
                                     MSGID_DESCRIPTION_TRUSTALL);
      argParser.addArgument(trustAll);

      keyStorePath = new StringArgument("keyStorePath", 'K', "keyStorePath",
                                        false, false, true, "{keyStorePath}",
      keyStorePath = new StringArgument("keyStorePath",
                                        OPTION_SHORT_KEYSTOREPATH,
                                        OPTION_LONG_KEYSTOREPATH,
                                        false, false, true,
                                        OPTION_VALUE_KEYSTOREPATH,
                                        null, null,
                                        MSGID_DESCRIPTION_KEYSTOREPATH);
      argParser.addArgument(keyStorePath);

      keyStorePassword = new StringArgument("keyStorePassword", 'W',
                                  "keyStorePassword", false, false,
      keyStorePassword = new StringArgument("keyStorePassword",
                                  OPTION_SHORT_KEYSTORE_PWD,
                                  OPTION_LONG_KEYSTORE_PWD, false, false,
                                  true, "{keyStorePassword}", null, null,
                                  MSGID_DESCRIPTION_KEYSTOREPASSWORD);
      argParser.addArgument(keyStorePassword);

      keyStorePasswordFile =
           new FileBasedArgument("keyStorePasswordFile", null,
                                 "keyStorePasswordFile", false, false, "{path}",
           new FileBasedArgument("keyStorePasswordFile",
                                 OPTION_SHORT_KEYSTORE_PWD_FILE,
                                 OPTION_LONG_KEYSTORE_PWD_FILE,
                                 false, false,
                                 OPTION_VALUE_KEYSTORE_PWD_FILE,
                                 null, null,
                                 MSGID_DESCRIPTION_KEYSTOREPASSWORD_FILE);
      argParser.addArgument(keyStorePasswordFile);
@@ -453,28 +475,34 @@
                                        null, MSGID_DESCRIPTION_CERT_NICKNAME);
      argParser.addArgument(certNickname);

      trustStorePath = new StringArgument("trustStorePath", 'P',
                                          "trustStorePath", false, false, true,
                                          "{trustStorePath}", null, null,
      trustStorePath = new StringArgument("trustStorePath",
                                          OPTION_SHORT_TRUSTSTOREPATH,
                                          OPTION_LONG_TRUSTSTOREPATH,
                                          false, false, true,
                                          OPTION_VALUE_TRUSTSTOREPATH,
                                          null, null,
                                          MSGID_DESCRIPTION_TRUSTSTOREPATH);
      argParser.addArgument(trustStorePath);

      trustStorePassword =
           new StringArgument("trustStorePassword", null, "trustStorePassword",
                              false, false, true, "{trustStorePassword}", null,
           new StringArgument("trustStorePassword", null,
                              OPTION_LONG_TRUSTSTORE_PWD,
                              false, false, true,
                              OPTION_VALUE_TRUSTSTORE_PWD, null,
                              null, MSGID_DESCRIPTION_TRUSTSTOREPASSWORD);
      argParser.addArgument(trustStorePassword);

      trustStorePasswordFile =
           new FileBasedArgument("trustStorePasswordFile", null,
                                 "trustStorePasswordFile", false, false,
                                 "{path}", null, null,
           new FileBasedArgument("trustStorePasswordFile",
                                 OPTION_SHORT_TRUSTSTORE_PWD_FILE,
                                 OPTION_LONG_TRUSTSTORE_PWD_FILE, false, false,
                                 OPTION_VALUE_TRUSTSTORE_PWD_FILE, null, null,
                                 MSGID_DESCRIPTION_TRUSTSTOREPASSWORD_FILE);
      argParser.addArgument(trustStorePasswordFile);

      assertionFilter = new StringArgument("assertionfilter", null,
                                 "assertionFilter", false, false, true,
                                 "{filter}", null, null,
                                 OPTION_LONG_ASSERTION_FILE, false, false, true,
                                 OPTION_VALUE_ASSERTION_FILE, null, null,
                                 MSGID_DESCRIPTION_ASSERTION_FILTER);
      argParser.addArgument(assertionFilter);

@@ -500,8 +528,8 @@
                                    MSGID_DESCRIPTION_CONTINUE_ON_ERROR);
      argParser.addArgument(continueOnError);

      noop = new BooleanArgument("no-op", 'n',
                                    "noop",
      noop = new BooleanArgument("no-op", OPTION_SHORT_DRYRUN,
                                    OPTION_LONG_DRYRUN,
                                    MSGID_DESCRIPTION_NOOP);
      argParser.addArgument(noop);

@@ -509,7 +537,8 @@
                                    MSGID_DESCRIPTION_VERBOSE);
      argParser.addArgument(verbose);

      showUsage = new BooleanArgument("showUsage", 'H', "help",
      showUsage = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
                                    OPTION_LONG_HELP,
                                    MSGID_DESCRIPTION_SHOWUSAGE);
      argParser.addArgument(showUsage);
      argParser.setUsageArgument(showUsage, out);

 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDelete.java

@@ -65,6 +65,7 @@
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;


/**
@@ -352,42 +353,53 @@
                                                  false, true, 0, 1, "\"DN\"");
    try
    {
      hostName = new StringArgument("host", 'h', "host", false, false, true,
                                    "{host}", "localhost", null,
      hostName = new StringArgument("host", OPTION_SHORT_HOST,
                                    OPTION_LONG_HOST, false, false, true,
                                    OPTION_VALUE_HOST, "localhost", null,
                                    MSGID_DESCRIPTION_HOST);
      argParser.addArgument(hostName);

      port = new IntegerArgument("port", 'p', "port", false, false, true,
                                 "{port}", 389, null, MSGID_DESCRIPTION_PORT);
      port = new IntegerArgument("port", OPTION_SHORT_PORT,
                                 OPTION_LONG_PORT, false, false, true,
                                 OPTION_VALUE_PORT, 389, null,
                                 MSGID_DESCRIPTION_PORT);
      argParser.addArgument(port);

      useSSL = new BooleanArgument("useSSL", 'Z', "useSSL",
      useSSL = new BooleanArgument("useSSL", OPTION_SHORT_USE_SSL,
                                   OPTION_LONG_USE_SSL,
                                   MSGID_DESCRIPTION_USE_SSL);
      argParser.addArgument(useSSL);

      startTLS = new BooleanArgument("startTLS", 'q', "startTLS",
      startTLS = new BooleanArgument("startTLS", OPTION_SHORT_START_TLS,
                                     OPTION_LONG_START_TLS,
                                     MSGID_DESCRIPTION_START_TLS);
      argParser.addArgument(startTLS);

      bindDN = new StringArgument("bindDN", 'D', "bindDN", false, false, true,
                                  "{bindDN}", null, null,
      bindDN = new StringArgument("bindDN", OPTION_SHORT_BINDDN,
                                  OPTION_LONG_BINDDN, false, false, true,
                                  OPTION_VALUE_BINDDN, null, null,
                                  MSGID_DESCRIPTION_BINDDN);
      argParser.addArgument(bindDN);

      bindPassword = new StringArgument("bindPassword", 'w', "bindPassword",
                                        false, false, true, "{bindPassword}",
      bindPassword = new StringArgument("bindPassword", OPTION_SHORT_BINDPWD,
                                        OPTION_LONG_BINDPWD,
                                        false, false, true,
                                        OPTION_VALUE_BINDPWD,
                                        null, null,
                                        MSGID_DESCRIPTION_BINDPASSWORD);
      argParser.addArgument(bindPassword);

      bindPasswordFile =
           new FileBasedArgument("bindPasswordFile", 'j', "bindPasswordFile",
                                 false, false, "{bindPasswordFilename}", null,
           new FileBasedArgument("bindPasswordFile", OPTION_SHORT_BINDPWD_FILE,
                                 OPTION_LONG_BINDPWD_FILE,
                                 false, false,
                                 OPTION_VALUE_BINDPWD_FILE, null,
                                 null, MSGID_DESCRIPTION_BINDPASSWORDFILE);
      argParser.addArgument(bindPasswordFile);

      filename = new StringArgument("filename", 'f', "filename", false, false,
                                    true, "{filename}", null, null,
      filename = new StringArgument("filename", OPTION_SHORT_FILENAME,
                                    OPTION_LONG_FILENAME, false, false,
                                    true, OPTION_VALUE_FILENAME, null, null,
                                    MSGID_DELETE_DESCRIPTION_FILENAME);
      argParser.addArgument(filename);

@@ -396,8 +408,10 @@
                                         MSGID_DESCRIPTION_USE_SASL_EXTERNAL);
      argParser.addArgument(saslExternal);

      saslOptions = new StringArgument("saslOption", 'o', "saslOption",
                                       false, true, true, "{name=value}", null,
      saslOptions = new StringArgument("saslOption", OPTION_SHORT_SASLOPTION,
                                       OPTION_LONG_SASLOPTION,
                                       false, true, true,
                                       OPTION_VALUE_SASLOPTION, null,
                                       null, MSGID_DESCRIPTION_SASL_PROPERTIES);
      argParser.addArgument(saslOptions);

@@ -405,22 +419,30 @@
                                     MSGID_DESCRIPTION_TRUSTALL);
      argParser.addArgument(trustAll);

      keyStorePath = new StringArgument("keyStorePath", 'K', "keyStorePath",
                                        false, false, true, "{keyStorePath}",
      keyStorePath = new StringArgument("keyStorePath",
                                        OPTION_SHORT_KEYSTOREPATH,
                                        OPTION_LONG_KEYSTOREPATH,
                                        false, false, true,
                                        OPTION_VALUE_KEYSTOREPATH,
                                        null, null,
                                        MSGID_DESCRIPTION_KEYSTOREPATH);
      argParser.addArgument(keyStorePath);

      keyStorePassword = new StringArgument("keyStorePassword", 'W',
                                            "keyStorePassword", false, false,
                                            true, "{keyStorePassword}", null,
                                            null,
      keyStorePassword = new StringArgument("keyStorePassword",
                                            OPTION_SHORT_KEYSTORE_PWD,
                                            OPTION_LONG_KEYSTORE_PWD,
                                            false, false,
                                            true, OPTION_VALUE_KEYSTORE_PWD,
                                            null, null,
                                            MSGID_DESCRIPTION_KEYSTOREPASSWORD);
      argParser.addArgument(keyStorePassword);

      keyStorePasswordFile =
           new FileBasedArgument("keyStorePasswordFile", null,
                                 "keyStorePasswordFile", false, false, "{path}",
           new FileBasedArgument("keyStorePasswordFile",
                                 OPTION_SHORT_KEYSTORE_PWD_FILE,
                                 OPTION_LONG_KEYSTORE_PWD_FILE,
                                 false, false,
                                 OPTION_VALUE_KEYSTORE_PWD_FILE,
                                 null, null,
                                 MSGID_DESCRIPTION_KEYSTOREPASSWORD_FILE);
      argParser.addArgument(keyStorePasswordFile);
@@ -430,22 +452,28 @@
                                        null, MSGID_DESCRIPTION_CERT_NICKNAME);
      argParser.addArgument(certNickname);

      trustStorePath = new StringArgument("trustStorePath", 'P',
                                          "trustStorePath", false, false, true,
                                          "{trustStorePath}", null, null,
      trustStorePath = new StringArgument("trustStorePath",
                                          OPTION_SHORT_TRUSTSTOREPATH,
                                          OPTION_LONG_TRUSTSTOREPATH,
                                          false, false, true,
                                          OPTION_VALUE_TRUSTSTOREPATH,
                                          null, null,
                                          MSGID_DESCRIPTION_TRUSTSTOREPATH);
      argParser.addArgument(trustStorePath);

      trustStorePassword =
           new StringArgument("trustStorePassword", null, "trustStorePassword",
                              false, false, true, "{trustStorePassword}", null,
           new StringArgument("trustStorePassword", null,
                              OPTION_LONG_TRUSTSTORE_PWD,
                              false, false, true,
                              OPTION_VALUE_TRUSTSTORE_PWD, null,
                              null, MSGID_DESCRIPTION_TRUSTSTOREPASSWORD);
      argParser.addArgument(trustStorePassword);

      trustStorePasswordFile =
           new FileBasedArgument("trustStorePasswordFile", null,
                                 "trustStorePasswordFile", false, false,
                                 "{path}", null, null,
           new FileBasedArgument("trustStorePasswordFile",
                                 OPTION_SHORT_TRUSTSTORE_PWD_FILE,
                                 OPTION_LONG_TRUSTSTORE_PWD_FILE, false, false,
                                 OPTION_VALUE_TRUSTSTORE_PWD_FILE, null, null,
                                 MSGID_DESCRIPTION_TRUSTSTOREPASSWORD_FILE);
      argParser.addArgument(trustStorePasswordFile);

@@ -475,14 +503,16 @@
                               MSGID_DESCRIPTION_CONTINUE_ON_ERROR);
      argParser.addArgument(continueOnError);

      noop = new BooleanArgument("no-op", 'n', "noop", MSGID_DESCRIPTION_NOOP);
      noop = new BooleanArgument("no-op", OPTION_SHORT_DRYRUN,
          OPTION_LONG_DRYRUN, MSGID_DESCRIPTION_NOOP);
      argParser.addArgument(noop);

      verbose = new BooleanArgument("verbose", 'v', "verbose",
                                    MSGID_DESCRIPTION_VERBOSE);
      argParser.addArgument(verbose);

      showUsage = new BooleanArgument("showUsage", 'H', "help",
      showUsage = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
                                      OPTION_LONG_HELP,
                                      MSGID_DESCRIPTION_SHOWUSAGE);
      argParser.addArgument(showUsage);
      argParser.setUsageArgument(showUsage, out);

 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java

@@ -84,6 +84,7 @@
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;



@@ -630,37 +631,48 @@
                                                  false);
    try
    {
      hostName = new StringArgument("host", 'h', "host", false, false, true,
                                    "{host}", "localhost", null,
      hostName = new StringArgument("host", OPTION_SHORT_HOST,
                                    OPTION_LONG_HOST, false, false, true,
                                    OPTION_VALUE_HOST, "localhost", null,
                                    MSGID_DESCRIPTION_HOST);
      argParser.addArgument(hostName);

      port = new IntegerArgument("port", 'p', "port", false, false, true,
                                 "{port}", 389, null, MSGID_DESCRIPTION_PORT);
      port = new IntegerArgument("port", OPTION_SHORT_PORT,
                                 OPTION_LONG_PORT, false, false, true,
                                 OPTION_VALUE_PORT, 389, null,
                                 MSGID_DESCRIPTION_PORT);
      argParser.addArgument(port);

      useSSL = new BooleanArgument("useSSL", 'Z', "useSSL",
      useSSL = new BooleanArgument("useSSL", OPTION_SHORT_USE_SSL,
                                   OPTION_LONG_USE_SSL,
                                   MSGID_DESCRIPTION_USE_SSL);
      argParser.addArgument(useSSL);

      startTLS = new BooleanArgument("startTLS", 'q', "startTLS",
      startTLS = new BooleanArgument("startTLS", OPTION_SHORT_START_TLS,
                                     OPTION_LONG_START_TLS,
                                     MSGID_DESCRIPTION_START_TLS);
      argParser.addArgument(startTLS);

      bindDN = new StringArgument("bindDN", 'D', "bindDN", false, false, true,
                                  "{bindDN}", null, null,
      bindDN = new StringArgument("bindDN", OPTION_SHORT_BINDDN,
                                  OPTION_LONG_BINDDN, false, false, true,
                                  OPTION_VALUE_BINDDN, null, null,
                                  MSGID_DESCRIPTION_BINDDN);
      argParser.addArgument(bindDN);

      bindPassword = new StringArgument("bindPassword", 'w', "bindPassword",
                                        false, false, true, "{bindPassword}",
      bindPassword = new StringArgument("bindPassword", OPTION_SHORT_BINDPWD,
                                        OPTION_LONG_BINDPWD,
                                        false, false, true,
                                        OPTION_VALUE_BINDPWD,
                                        null, null,
                                        MSGID_DESCRIPTION_BINDPASSWORD);
      argParser.addArgument(bindPassword);

      bindPasswordFile =
           new FileBasedArgument("bindPasswordFile", 'j', "bindPasswordFile",
                                 false, false, "{bindPasswordFilename}", null,
           new FileBasedArgument("bindPasswordFile",
                                 OPTION_SHORT_BINDPWD_FILE,
                                 OPTION_LONG_BINDPWD_FILE,
                                 false, false,
                                 OPTION_VALUE_BINDPWD_FILE, null,
                                 null, MSGID_DESCRIPTION_BINDPASSWORDFILE);
      argParser.addArgument(bindPasswordFile);

@@ -668,8 +680,9 @@
                                       MSGID_MODIFY_DESCRIPTION_DEFAULT_ADD);
      argParser.addArgument(defaultAdd);

      filename = new StringArgument("filename", 'f', "filename", false, false,
                                    true, "{filename}", null, null,
      filename = new StringArgument("filename", OPTION_SHORT_FILENAME,
                                    OPTION_LONG_FILENAME, false, false,
                                    true, OPTION_VALUE_FILENAME, null, null,
                                    MSGID_DELETE_DESCRIPTION_FILENAME);
      argParser.addArgument(filename);

@@ -678,8 +691,10 @@
                                         MSGID_DESCRIPTION_USE_SASL_EXTERNAL);
      argParser.addArgument(saslExternal);

      saslOptions = new StringArgument("saslOption", 'o', "saslOption", false,
                                       true, true, "{name=value}", null, null,
      saslOptions = new StringArgument("saslOption", OPTION_SHORT_SASLOPTION,
                                       OPTION_LONG_SASLOPTION, false,
                                       true, true,
                                       OPTION_VALUE_SASLOPTION, null, null,
                                       MSGID_DESCRIPTION_SASL_PROPERTIES);
      argParser.addArgument(saslOptions);

@@ -687,22 +702,30 @@
                                    MSGID_DESCRIPTION_TRUSTALL);
      argParser.addArgument(trustAll);

      keyStorePath = new StringArgument("keyStorePath", 'K', "keyStorePath",
                                        false, false, true, "{keyStorePath}",
      keyStorePath = new StringArgument("keyStorePath",
                                        OPTION_SHORT_KEYSTOREPATH,
                                        OPTION_LONG_KEYSTOREPATH,
                                        false, false, true,
                                        OPTION_VALUE_KEYSTOREPATH,
                                        null, null,
                                        MSGID_DESCRIPTION_KEYSTOREPATH);
      argParser.addArgument(keyStorePath);

      keyStorePassword = new StringArgument("keyStorePassword", 'W',
                                            "keyStorePassword", false, false,
                                            true, "{keyStorePassword}", null,
                                            null,
      keyStorePassword = new StringArgument("keyStorePassword",
                                            OPTION_SHORT_KEYSTORE_PWD,
                                            OPTION_LONG_KEYSTORE_PWD,
                                            false, false,
                                            true,
                                            OPTION_VALUE_KEYSTORE_PWD,
                                            null, null,
                                            MSGID_DESCRIPTION_KEYSTOREPASSWORD);
      argParser.addArgument(keyStorePassword);

      keyStorePasswordFile =
           new FileBasedArgument("keystorepasswordfile", null,
                                 "keyStorePasswordFile", false, false, "{path}",
           new FileBasedArgument("keystorepasswordfile",
                                 OPTION_SHORT_KEYSTORE_PWD_FILE,
                                 OPTION_LONG_KEYSTORE_PWD_FILE,
                                 false, false, OPTION_VALUE_KEYSTORE_PWD_FILE,
                                 null, null,
                                 MSGID_DESCRIPTION_KEYSTOREPASSWORD_FILE);
      argParser.addArgument(keyStorePasswordFile);
@@ -712,27 +735,36 @@
                                        null, MSGID_DESCRIPTION_CERT_NICKNAME);
      argParser.addArgument(certNickname);

      trustStorePath = new StringArgument("trustStorePath", 'P',
                                          "trustStorePath", false, false, true,
                                          "{trustStorePath}", null, null,
      trustStorePath = new StringArgument("trustStorePath",
                                          OPTION_SHORT_TRUSTSTOREPATH,
                                          OPTION_LONG_TRUSTSTOREPATH,
                                          false, false, true,
                                          OPTION_VALUE_TRUSTSTOREPATH,
                                          null, null,
                                          MSGID_DESCRIPTION_TRUSTSTOREPATH);
      argParser.addArgument(trustStorePath);

      trustStorePassword =
           new StringArgument("trustStorePassword", null, "trustStorePassword",
                              false, false, true, "{trustStorePassword}", null,
           new StringArgument("trustStorePassword", null,
                              OPTION_LONG_TRUSTSTORE_PWD ,
                              false, false, true,
                              OPTION_VALUE_TRUSTSTORE_PWD, null,
                              null, MSGID_DESCRIPTION_TRUSTSTOREPASSWORD);
      argParser.addArgument(trustStorePassword);

      trustStorePasswordFile =
           new FileBasedArgument("truststorepasswordfile", null,
                                 "trustStorePasswordFile", false, false,
                                 "{path}", null, null,
           new FileBasedArgument("truststorepasswordfile",
                                 OPTION_SHORT_TRUSTSTORE_PWD_FILE,
                                 OPTION_LONG_TRUSTSTORE_PWD_FILE, false, false,
                                 OPTION_VALUE_TRUSTSTORE_PWD_FILE, null, null,
                                 MSGID_DESCRIPTION_TRUSTSTOREPASSWORD_FILE);
      argParser.addArgument(trustStorePasswordFile);

      proxyAuthzID = new StringArgument("proxy_authzid", 'Y', "proxyAs", false,
                                        false, true, "{authzID}", null, null,
      proxyAuthzID = new StringArgument("proxy_authzid",
                                        OPTION_SHORT_PROXYAUTHID,
                                        OPTION_LONG_PROXYAUTHID, false,
                                        false, true,
                                        OPTION_VALUE_PROXYAUTHID, null, null,
                                        MSGID_DESCRIPTION_PROXY_AUTHZID);
      argParser.addArgument(proxyAuthzID);

@@ -742,8 +774,11 @@
      argParser.addArgument(reportAuthzID);

      assertionFilter = new StringArgument("assertionfilter", null,
                                           "assertionFilter", false, false,
                                           true, "{filter}", null, null,
                                           OPTION_LONG_ASSERTION_FILE,
                                           false, false,
                                           true,
                                           OPTION_VALUE_ASSERTION_FILE,
                                           null, null,
                                           MSGID_DESCRIPTION_ASSERTION_FILTER);
      argParser.addArgument(assertionFilter);

@@ -782,7 +817,8 @@
                                    MSGID_DESCRIPTION_CONTINUE_ON_ERROR);
      argParser.addArgument(continueOnError);

      noop = new BooleanArgument("no-op", 'n', "noop",
      noop = new BooleanArgument("no-op", OPTION_SHORT_DRYRUN,
                                    OPTION_LONG_DRYRUN,
                                    MSGID_DESCRIPTION_NOOP);
      argParser.addArgument(noop);

@@ -790,7 +826,8 @@
                                    MSGID_DESCRIPTION_VERBOSE);
      argParser.addArgument(verbose);

      showUsage = new BooleanArgument("showUsage", 'H', "help",
      showUsage = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
                                      OPTION_LONG_HELP,
                                      MSGID_DESCRIPTION_SHOWUSAGE);
      argParser.addArgument(showUsage);
      argParser.setUsageArgument(showUsage, out);

 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java

@@ -62,6 +62,7 @@
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;



@@ -196,43 +197,51 @@

    try
    {
      ldapHost = new StringArgument("ldaphost", 'h', "ldapHost", false, false,
                                    true, "{host}", "127.0.0.1", null,
      ldapHost = new StringArgument("ldaphost", OPTION_SHORT_HOST,
                                    OPTION_LONG_HOST, false, false,
                                    true, OPTION_VALUE_HOST, "127.0.0.1", null,
                                    MSGID_LDAPPWMOD_DESCRIPTION_HOST);
      argParser.addArgument(ldapHost);


      ldapPort = new IntegerArgument("ldapport", 'p', "ldapPort", false, false,
                                     true, "{port}", 389, null, true, 1, true,
      ldapPort = new IntegerArgument("ldapport", OPTION_SHORT_PORT,
                                     OPTION_LONG_PORT, false, false,
                                     true, OPTION_VALUE_PORT, 389,
                                     null, true, 1, true,
                                     65535, MSGID_LDAPPWMOD_DESCRIPTION_PORT);
      argParser.addArgument(ldapPort);


      useSSL = new BooleanArgument("usessl", 'Z', "useSSL",
      useSSL = new BooleanArgument("usessl", OPTION_SHORT_USE_SSL,
                                   OPTION_LONG_USE_SSL,
                                   MSGID_LDAPPWMOD_DESCRIPTION_USE_SSL);
      argParser.addArgument(useSSL);


      useStartTLS = new BooleanArgument("usestarttls", 'q', "useStartTLS",
      useStartTLS = new BooleanArgument("usestarttls", OPTION_SHORT_START_TLS,
                             OPTION_LONG_START_TLS,
                             MSGID_LDAPPWMOD_DESCRIPTION_USE_STARTTLS);
      argParser.addArgument(useStartTLS);


      bindDN = new StringArgument("binddn", 'D', "bindDN", false, false, true,
                                  "{bindDN}", null, null,
      bindDN = new StringArgument("binddn", OPTION_SHORT_BINDDN,
                                  OPTION_LONG_BINDDN, false, false, true,
                                  OPTION_VALUE_BINDDN, null, null,
                                  MSGID_LDAPPWMOD_DESCRIPTION_BIND_DN);
      argParser.addArgument(bindDN);


      bindPW = new StringArgument("bindpw", 'w', "bindPassword", false, false,
                                  true, "{bindDN}", null, null,
      bindPW = new StringArgument("bindpw", OPTION_SHORT_BINDPWD,
                                  OPTION_LONG_BINDPWD, false, false,
                                  true, OPTION_VALUE_BINDPWD, null, null,
                                  MSGID_LDAPPWMOD_DESCRIPTION_BIND_PW);
      argParser.addArgument(bindPW);


      bindPWFile =
           new FileBasedArgument("bindpwfile", 'j', "bindPasswordFile", false,
                                 false, "{file}", null, null,
           new FileBasedArgument("bindpwfile", OPTION_SHORT_BINDPWD_FILE,
                                 OPTION_LONG_BINDPWD_FILE, false,
                                 false, OPTION_VALUE_BINDPWD_FILE, null, null,
                                 MSGID_LDAPPWMOD_DESCRIPTION_BIND_PW_FILE);
      argParser.addArgument(bindPWFile);

@@ -282,44 +291,58 @@


      sslKeyStore =
           new StringArgument("keystorepath", 'K', "keyStorePath", false, false,
                              true, "{keyStorePath}", null, null,
           new StringArgument("keystorepath", OPTION_SHORT_KEYSTOREPATH,
                              OPTION_LONG_KEYSTOREPATH, false, false,
                              true, OPTION_VALUE_KEYSTOREPATH, null, null,
                              MSGID_LDAPPWMOD_DESCRIPTION_KEYSTORE);
      argParser.addArgument(sslKeyStore);


      sslKeyStorePIN =
           new StringArgument("keystorepassword", 'W', "keyStorePassword",
                              false, false, true, "{password}", null, null,
           new StringArgument("keystorepassword",
                              OPTION_SHORT_KEYSTORE_PWD,
                              OPTION_LONG_KEYSTORE_PWD ,
                              false, false, true,
                              OPTION_VALUE_KEYSTORE_PWD,
                              null, null,
                              MSGID_LDAPPWMOD_DESCRIPTION_KEYSTORE_PIN);
      argParser.addArgument(sslKeyStorePIN);


      sslKeyStorePINFile =
           new FileBasedArgument("keystorepasswordilfe", null,
                                 "keyStorePasswordFile", false, false, "{path}",
           new FileBasedArgument("keystorepasswordfile",
                                 OPTION_SHORT_KEYSTORE_PWD_FILE,
                                 OPTION_LONG_KEYSTORE_PWD_FILE,
                                 false, false, OPTION_VALUE_KEYSTORE_PWD_FILE,
                                 null, null,
                                 MSGID_LDAPPWMOD_DESCRIPTION_KEYSTORE_PINFILE);
      argParser.addArgument(sslKeyStorePINFile);


      sslTrustStore =
           new StringArgument("truststorepath", 'P', "trustStorePath", false,
                              false, true, "{trustStorePath}", null, null,
           new StringArgument("truststorepath",
                              OPTION_SHORT_TRUSTSTOREPATH,
                              OPTION_LONG_TRUSTSTOREPATH, false,
                              false, true,
                              OPTION_VALUE_TRUSTSTOREPATH, null, null,
                              MSGID_LDAPPWMOD_DESCRIPTION_TRUSTSTORE);
      argParser.addArgument(sslTrustStore);


      sslTrustStorePIN =
           new StringArgument("truststorepassword", null, "trustStorePassword",
                              false, false, true, "{password}", null, null,
           new StringArgument("truststorepassword", null,
                              OPTION_LONG_TRUSTSTORE_PWD,
                              false, false, true,
                              OPTION_VALUE_TRUSTSTORE_PWD, null, null,
                              MSGID_LDAPPWMOD_DESCRIPTION_TRUSTSTORE_PIN);
      argParser.addArgument(sslTrustStorePIN);


      sslTrustStorePINFile =
           new FileBasedArgument("truststorepasswordfile", null,
                    "trustStorePasswordFile", false, false, "{path}", null,
           new FileBasedArgument("truststorepasswordfile",
                    OPTION_SHORT_TRUSTSTORE_PWD_FILE,
                    OPTION_LONG_TRUSTSTORE_PWD_FILE, false, false,
                    OPTION_VALUE_TRUSTSTORE_PWD_FILE, null,
                    null, MSGID_LDAPPWMOD_DESCRIPTION_TRUSTSTORE_PINFILE);
      argParser.addArgument(sslTrustStorePINFile);

@@ -331,7 +354,8 @@
      argParser.addArgument(controlStr);


      showUsage = new BooleanArgument("help", 'H', "help",
      showUsage = new BooleanArgument("help", OPTION_SHORT_HELP,
                                      OPTION_LONG_HELP,
                                      MSGID_LDAPPWMOD_DESCRIPTION_USAGE);
      argParser.addArgument(showUsage);
      argParser.setUsageArgument(showUsage, out);

 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearch.java

@@ -79,6 +79,7 @@
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;



@@ -614,42 +615,53 @@

    try
    {
      hostName = new StringArgument("host", 'h', "host", false, false, true,
                                    "{host}", "localhost", null,
      hostName = new StringArgument("host", OPTION_SHORT_HOST,
                                    OPTION_LONG_HOST, false, false, true,
                                    OPTION_VALUE_HOST, "localhost", null,
                                    MSGID_DESCRIPTION_HOST);
      argParser.addArgument(hostName);

      port = new IntegerArgument("port", 'p', "port", false, false, true,
                                 "{port}", 389, null, MSGID_DESCRIPTION_PORT);
      port = new IntegerArgument("port", OPTION_SHORT_PORT,
                                 OPTION_LONG_PORT, false, false, true,
                                 OPTION_VALUE_PORT, 389, null,
                                 MSGID_DESCRIPTION_PORT);
      argParser.addArgument(port);

      useSSL = new BooleanArgument("useSSL", 'Z', "useSSL",
      useSSL = new BooleanArgument("useSSL", OPTION_SHORT_USE_SSL,
                                   OPTION_LONG_USE_SSL,
                                   MSGID_DESCRIPTION_USE_SSL);
      argParser.addArgument(useSSL);

      startTLS = new BooleanArgument("startTLS", 'q', "startTLS",
      startTLS = new BooleanArgument("startTLS", OPTION_SHORT_START_TLS,
                                    OPTION_LONG_START_TLS,
                                    MSGID_DESCRIPTION_START_TLS);
      argParser.addArgument(startTLS);

      bindDN = new StringArgument("bindDN", 'D', "bindDN", false, false, true,
                                  "{bindDN}", null, null,
      bindDN = new StringArgument("bindDN", OPTION_SHORT_BINDDN,
                                  OPTION_LONG_BINDDN, false, false, true,
                                  OPTION_VALUE_BINDDN, null, null,
                                  MSGID_DESCRIPTION_BINDDN);
      argParser.addArgument(bindDN);

      bindPassword = new StringArgument("bindPassword", 'w', "bindPassword",
                                        false, false, true, "{bindPassword}",
      bindPassword = new StringArgument("bindPassword", OPTION_SHORT_BINDPWD,
                                        OPTION_LONG_BINDPWD,
                                        false, false, true,
                                        OPTION_VALUE_BINDPWD,
                                        null, null,
                                        MSGID_DESCRIPTION_BINDPASSWORD);
      argParser.addArgument(bindPassword);

      bindPasswordFile =
           new FileBasedArgument("bindPasswordFile", 'j', "bindPasswordFile",
                                 false, false, "{bindPasswordFilename}", null,
           new FileBasedArgument("bindPasswordFile", OPTION_SHORT_BINDPWD_FILE,
                                 OPTION_LONG_BINDPWD_FILE,
                                 false, false,
                                 OPTION_VALUE_BINDPWD_FILE, null,
                                 null, MSGID_DESCRIPTION_BINDPASSWORDFILE);
      argParser.addArgument(bindPasswordFile);

      baseDN = new StringArgument("baseDN", 'b', "baseDN", true, false, true,
                                  "{baseDN}", null, null,
      baseDN = new StringArgument("baseDN", OPTION_SHORT_BASEDN,
                                  OPTION_LONG_BASEDN, true, false, true,
                                  OPTION_VALUE_BASEDN, null, null,
                                  MSGID_SEARCH_DESCRIPTION_BASEDN);
      argParser.addArgument(baseDN);

@@ -658,8 +670,9 @@
                                       MSGID_SEARCH_DESCRIPTION_SEARCH_SCOPE);
      argParser.addArgument(searchScope);

      filename = new StringArgument("filename", 'f', "filename", false, false,
                                    true, "{filename}", null, null,
      filename = new StringArgument("filename", OPTION_SHORT_FILENAME,
                                    OPTION_LONG_FILENAME, false, false,
                                    true, OPTION_VALUE_FILENAME, null, null,
                                    MSGID_SEARCH_DESCRIPTION_FILENAME);
      argParser.addArgument(filename);

@@ -668,8 +681,10 @@
                                         MSGID_DESCRIPTION_USE_SASL_EXTERNAL);
      argParser.addArgument(saslExternal);

      saslOptions = new StringArgument("saslOption", 'o', "saslOption", false,
                                       true, true, "{name=value}", null, null,
      saslOptions = new StringArgument("saslOption", OPTION_SHORT_SASLOPTION,
                                       OPTION_LONG_SASLOPTION, false,
                                       true, true,
                                       OPTION_VALUE_SASLOPTION, null, null,
                                       MSGID_DESCRIPTION_SASL_PROPERTIES);
      argParser.addArgument(saslOptions);

@@ -677,21 +692,26 @@
                                    MSGID_DESCRIPTION_TRUSTALL);
      argParser.addArgument(trustAll);

      keyStorePath = new StringArgument("keyStorePath", 'K',
                                  "keyStorePath", false, false, true,
                                  "{keyStorePath}", null, null,
      keyStorePath = new StringArgument("keyStorePath",
                                  OPTION_SHORT_KEYSTOREPATH,
                                  OPTION_LONG_KEYSTOREPATH, false, false, true,
                                  OPTION_VALUE_KEYSTOREPATH, null, null,
                                  MSGID_DESCRIPTION_KEYSTOREPATH);
      argParser.addArgument(keyStorePath);

      keyStorePassword = new StringArgument("keyStorePassword", 'W',
                                  "keyStorePassword", false, false,
                                  true, "{keyStorePassword}", null, null,
      keyStorePassword = new StringArgument("keyStorePassword",
                                  OPTION_SHORT_KEYSTORE_PWD,
                                  OPTION_LONG_KEYSTORE_PWD, false, false,
                                  true, OPTION_VALUE_KEYSTORE_PWD, null, null,
                                  MSGID_DESCRIPTION_KEYSTOREPASSWORD);
      argParser.addArgument(keyStorePassword);

      keyStorePasswordFile =
           new FileBasedArgument("keystorepasswordfile", null,
                                 "keyStorePasswordFile", false, false, "{path}",
           new FileBasedArgument("keystorepasswordfile",
                                 OPTION_SHORT_KEYSTORE_PWD_FILE,
                                 OPTION_LONG_KEYSTORE_PWD_FILE,
                                 false, false,
                                 OPTION_VALUE_KEYSTORE_PWD_FILE,
                                 null, null,
                                 MSGID_DESCRIPTION_KEYSTOREPASSWORD_FILE);
      argParser.addArgument(keyStorePasswordFile);
@@ -701,27 +721,35 @@
                                        null, MSGID_DESCRIPTION_CERT_NICKNAME);
      argParser.addArgument(certNickname);

      trustStorePath = new StringArgument("trustStorePath", 'P',
                                  "trustStorePath", false, false, true,
                                  "{trustStorePath}", null, null,
      trustStorePath = new StringArgument("trustStorePath",
                                  OPTION_SHORT_TRUSTSTOREPATH,
                                  OPTION_LONG_TRUSTSTOREPATH,
                                  false, false, true,
                                  OPTION_VALUE_TRUSTSTOREPATH, null, null,
                                  MSGID_DESCRIPTION_TRUSTSTOREPATH);
      argParser.addArgument(trustStorePath);

      trustStorePassword =
           new StringArgument("trustStorePassword", null, "trustStorePassword",
                              false, false, true, "{trustStorePassword}", null,
           new StringArgument("trustStorePassword", null,
                              OPTION_LONG_TRUSTSTORE_PWD,
                              false, false, true, OPTION_VALUE_TRUSTSTORE_PWD,
                              null,
                              null, MSGID_DESCRIPTION_TRUSTSTOREPASSWORD);
      argParser.addArgument(trustStorePassword);

      trustStorePasswordFile =
           new FileBasedArgument("truststorepasswordfile", null,
                                 "trustStorePasswordFile", false, false,
                                 "{path}", null, null,
           new FileBasedArgument("truststorepasswordfile",
                                 OPTION_SHORT_TRUSTSTORE_PWD_FILE,
                                 OPTION_LONG_TRUSTSTORE_PWD_FILE, false, false,
                                 OPTION_VALUE_TRUSTSTORE_PWD_FILE, null, null,
                                 MSGID_DESCRIPTION_TRUSTSTOREPASSWORD_FILE);
      argParser.addArgument(trustStorePasswordFile);

      proxyAuthzID = new StringArgument("proxy_authzid", 'Y', "proxyAs", false,
                                        false, true, "{authzID}", null, null,
      proxyAuthzID = new StringArgument("proxy_authzid",
                                        OPTION_SHORT_PROXYAUTHID,
                                        OPTION_LONG_PROXYAUTHID, false,
                                        false, true,
                                        OPTION_VALUE_PROXYAUTHID, null, null,
                                        MSGID_DESCRIPTION_PROXY_AUTHZID);
      argParser.addArgument(proxyAuthzID);

@@ -748,8 +776,10 @@
      argParser.addArgument(simplePageSize);

      assertionFilter = new StringArgument("assertionfilter", null,
                                           "assertionFilter", false, false,
                                           true, "{filter}", null, null,
                                           OPTION_LONG_ASSERTION_FILE,
                                           false, false,
                                           true, OPTION_VALUE_ASSERTION_FILE,
                                           null, null,
                                           MSGID_DESCRIPTION_ASSERTION_FILTER);
      argParser.addArgument(assertionFilter);

@@ -808,14 +838,16 @@
                               MSGID_DESCRIPTION_CONTINUE_ON_ERROR);
      argParser.addArgument(continueOnError);

      noop = new BooleanArgument("noop", 'n', "noop", MSGID_DESCRIPTION_NOOP);
      noop = new BooleanArgument("noop", OPTION_SHORT_DRYRUN,
          OPTION_LONG_DRYRUN, MSGID_DESCRIPTION_NOOP);
      argParser.addArgument(noop);

      verbose = new BooleanArgument("verbose", 'v', "verbose",
                                    MSGID_DESCRIPTION_VERBOSE);
      argParser.addArgument(verbose);

      showUsage = new BooleanArgument("showUsage", 'H', "help",
      showUsage = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
                                    OPTION_LONG_HELP,
                                    MSGID_DESCRIPTION_SHOWUSAGE);
      argParser.addArgument(showUsage);
      argParser.setUsageArgument(showUsage, out);

 opendj-sdk/opends/src/server/org/opends/server/tools/LDIFDiff.java

@@ -58,6 +58,7 @@

import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.*;



@@ -175,14 +176,16 @@
      configFile.setHidden(true);
      argParser.addArgument(configFile);

      configClass = new StringArgument("configclass", 'C', "configClass", false,
                             false, true, "{configClass}",
      configClass = new StringArgument("configclass", OPTION_SHORT_CONFIG_CLASS,
                             OPTION_LONG_CONFIG_CLASS, false,
                             false, true, OPTION_VALUE_CONFIG_CLASS,
                             ConfigFileHandler.class.getName(), null,
                             MSGID_LDIFDIFF_DESCRIPTION_CONFIG_CLASS);
      configClass.setHidden(true);
      argParser.addArgument(configClass);

      showUsage = new BooleanArgument("showusage", 'H', "help",
      showUsage = new BooleanArgument("showusage", OPTION_SHORT_HELP,
                                      OPTION_LONG_HELP,
                                      MSGID_LDIFDIFF_DESCRIPTION_USAGE);
      argParser.addArgument(showUsage);
      argParser.setUsageArgument(showUsage);

 opendj-sdk/opends/src/server/org/opends/server/tools/LDIFModify.java

@@ -68,6 +68,7 @@
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;



@@ -439,8 +440,9 @@
      argParser.addArgument(configFile);


      configClass = new StringArgument("configclass", 'C', "configClass", false,
                             false, true, "{configClass}",
      configClass = new StringArgument("configclass", OPTION_SHORT_CONFIG_CLASS,
                             OPTION_LONG_CONFIG_CLASS, false,
                             false, true, OPTION_VALUE_CONFIG_CLASS,
                             ConfigFileHandler.class.getName(), null,
                             MSGID_LDIFMODIFY_DESCRIPTION_CONFIG_CLASS);
      configClass.setHidden(true);
@@ -465,7 +467,8 @@
      argParser.addArgument(targetFile);


      showUsage = new BooleanArgument("help", 'H', "help",
      showUsage = new BooleanArgument("help", OPTION_SHORT_HELP,
                                      OPTION_LONG_HELP,
                                      MSGID_LDIFMODIFY_DESCRIPTION_HELP);
      argParser.addArgument(showUsage);
      argParser.setUsageArgument(showUsage);

 opendj-sdk/opends/src/server/org/opends/server/tools/LDIFSearch.java

@@ -59,6 +59,7 @@
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;



@@ -169,8 +170,9 @@
                                    MSGID_LDIFSEARCH_DESCRIPTION_LDIF_FILE);
      argParser.addArgument(ldifFile);

      baseDNString = new StringArgument("basedn", 'b', "baseDN", false, true,
                                        true, "{baseDN}", "", null,
      baseDNString = new StringArgument("basedn", OPTION_SHORT_BASEDN,
                                        OPTION_LONG_BASEDN, false, true,
                                        true, OPTION_VALUE_BASEDN, "", null,
                                        MSGID_LDIFSEARCH_DESCRIPTION_BASEDN);
      argParser.addArgument(baseDNString);

@@ -186,8 +188,9 @@
      configFile.setHidden(true);
      argParser.addArgument(configFile);

      configClass = new StringArgument("configclass", 'C', "configClass", false,
                             false, true, "{configClass}",
      configClass = new StringArgument("configclass", OPTION_SHORT_CONFIG_CLASS,
                             OPTION_LONG_CONFIG_CLASS, false,
                             false, true, OPTION_VALUE_CONFIG_CLASS,
                             ConfigFileHandler.class.getName(), null,
                             MSGID_LDIFSEARCH_DESCRIPTION_CONFIG_CLASS);
      configClass.setHidden(true);
@@ -225,7 +228,8 @@
      argParser.addArgument(timeLimit);


      showUsage = new BooleanArgument("help", 'H', "help",
      showUsage = new BooleanArgument("help", OPTION_SHORT_HELP,
                                      OPTION_LONG_HELP,
                                      MSGID_LDIFSEARCH_DESCRIPTION_USAGE);
      argParser.addArgument(showUsage);
      argParser.setUsageArgument(showUsage);

 opendj-sdk/opends/src/server/org/opends/server/tools/ListBackends.java

@@ -56,6 +56,7 @@
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;



@@ -158,8 +159,9 @@
    try
    {
      configClass =
           new StringArgument("configclass", 'C', "configClass", true, false,
                              true, "{configClass}",
           new StringArgument("configclass", OPTION_SHORT_CONFIG_CLASS,
                              OPTION_LONG_CONFIG_CLASS, true, false,
                              true, OPTION_VALUE_CONFIG_CLASS,
                              ConfigFileHandler.class.getName(), null,
                              MSGID_LISTBACKENDS_DESCRIPTION_CONFIG_CLASS);
      configClass.setHidden(true);
@@ -180,13 +182,15 @@
      argParser.addArgument(backendID);


      baseDN = new StringArgument("basedn", 'b', "baseDN", false, true, true,
                                  "{baseDN}", null, null,
      baseDN = new StringArgument("basedn", OPTION_SHORT_BASEDN,
                                  OPTION_LONG_BASEDN, false, true, true,
                                  OPTION_VALUE_BASEDN, null, null,
                                  MSGID_LISTBACKENDS_DESCRIPTION_BASE_DN);
      argParser.addArgument(baseDN);


      displayUsage = new BooleanArgument("help", 'H', "help",
      displayUsage = new BooleanArgument("help", OPTION_SHORT_HELP,
                                         OPTION_LONG_HELP,
                                         MSGID_LISTBACKENDS_DESCRIPTION_HELP);
      argParser.addArgument(displayUsage);
      argParser.setUsageArgument(displayUsage, out);

 opendj-sdk/opends/src/server/org/opends/server/tools/RestoreDB.java

@@ -65,6 +65,7 @@
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;



@@ -137,8 +138,9 @@
    try
    {
      configClass =
           new StringArgument("configclass", 'C', "configClass", true, false,
                              true, "{configClass}",
           new StringArgument("configclass", OPTION_SHORT_CONFIG_CLASS,
                              OPTION_LONG_CONFIG_CLASS, true, false,
                              true, OPTION_VALUE_CONFIG_CLASS,
                              ConfigFileHandler.class.getName(), null,
                              MSGID_RESTOREDB_DESCRIPTION_CONFIG_CLASS);
      configClass.setHidden(true);
@@ -172,13 +174,14 @@
      argParser.addArgument(listBackups);


      verifyOnly = new BooleanArgument("verifyonly", 'V', "verifyOnly",
      verifyOnly = new BooleanArgument("verifyonly", OPTION_SHORT_DRYRUN,
                                       OPTION_LONG_DRYRUN,
                                       MSGID_RESTOREDB_DESCRIPTION_VERIFY_ONLY);
      argParser.addArgument(verifyOnly);


      displayUsage =
           new BooleanArgument("help", 'H', "help",
           new BooleanArgument("help", OPTION_SHORT_HELP, OPTION_LONG_HELP,
                               MSGID_RESTOREDB_DESCRIPTION_USAGE);
      argParser.addArgument(displayUsage);
      argParser.setUsageArgument(displayUsage);

 opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java

@@ -72,6 +72,7 @@
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;



@@ -225,47 +226,62 @@

    try
    {
      host = new StringArgument("host", 'h', "host", false, false, true,
                                "{host}", "127.0.0.1", null,
      host = new StringArgument("host", OPTION_SHORT_HOST,
                                OPTION_LONG_HOST, false, false, true,
                                OPTION_VALUE_HOST, "127.0.0.1", null,
                                MSGID_STOPDS_DESCRIPTION_HOST);
      argParser.addArgument(host);

      port = new IntegerArgument("port", 'p', "port", false, false, true,
                                 "{port}", 389, null, true, 1, true, 65535,
                                 MSGID_STOPDS_DESCRIPTION_PORT);
      port = new IntegerArgument("port", OPTION_SHORT_PORT,
                                 OPTION_LONG_PORT, false, false, true,
                                 OPTION_VALUE_PORT, 389, null, true, 1,
                                 true, 65535, MSGID_STOPDS_DESCRIPTION_PORT);
      argParser.addArgument(port);

      useSSL = new BooleanArgument("usessl", 'Z', "useSSL",
      useSSL = new BooleanArgument("usessl", OPTION_SHORT_USE_SSL,
                                   OPTION_LONG_USE_SSL,
                                   MSGID_STOPDS_DESCRIPTION_USESSL);
      argParser.addArgument(useSSL);

      useStartTLS = new BooleanArgument("usestarttls", 'q', "useStartTLS",
      useStartTLS = new BooleanArgument("usestarttls", OPTION_SHORT_START_TLS,
                                        OPTION_LONG_START_TLS,
                                        MSGID_STOPDS_DESCRIPTION_USESTARTTLS);
      argParser.addArgument(useStartTLS);

      bindDN = new StringArgument("binddn", 'D', "bindDN", false, false, true,
                                  "{bindDN}", null, null,
      bindDN = new StringArgument("binddn", OPTION_SHORT_BINDDN,
                                  OPTION_LONG_BINDDN, false, false, true,
                                  OPTION_VALUE_BINDDN, null, null,
                                  MSGID_STOPDS_DESCRIPTION_BINDDN);
      argParser.addArgument(bindDN);

      bindPW = new StringArgument("bindpw", 'w', "bindPassword", false, false,
                                  true, "{bindPassword}", null, null,
      bindPW = new StringArgument("bindpw", OPTION_SHORT_BINDPWD,
                                  OPTION_LONG_BINDPWD, false, false,
                                  true,
                                  OPTION_VALUE_BINDPWD, null, null,
                                  MSGID_STOPDS_DESCRIPTION_BINDPW);
      argParser.addArgument(bindPW);

      bindPWFile = new FileBasedArgument("bindpwfile", 'j', "bindPasswordFile",
                                         false, false, "{bindPasswordFile}",
      bindPWFile = new FileBasedArgument("bindpwfile",
                                         OPTION_SHORT_BINDPWD_FILE,
                                         OPTION_LONG_BINDPWD_FILE,
                                         false, false,
                                         OPTION_VALUE_BINDPWD_FILE,
                                         null, null,
                                         MSGID_STOPDS_DESCRIPTION_BINDPWFILE);
      argParser.addArgument(bindPWFile);

      saslOption = new StringArgument("sasloption", 'o', "saslOption", false,
                                      true, true, "{saslOption}", null, null,
      saslOption = new StringArgument("sasloption", OPTION_SHORT_SASLOPTION,
                                      OPTION_LONG_SASLOPTION, false,
                                      true, true,
                                      OPTION_VALUE_SASLOPTION, null, null,
                                      MSGID_STOPDS_DESCRIPTION_SASLOPTIONS);
      argParser.addArgument(saslOption);

      proxyAuthzID = new StringArgument("proxyauthzid", 'Y', "proxyAs", false,
                                        false, true, "{proxyAuthZID}", null,
      proxyAuthzID = new StringArgument("proxyauthzid",
                                        OPTION_SHORT_PROXYAUTHID,
                                        OPTION_LONG_PROXYAUTHID, false,
                                        false, true,
                                        OPTION_VALUE_PROXYAUTHID, null,
                                        null,
                                        MSGID_STOPDS_DESCRIPTION_PROXYAUTHZID);
      argParser.addArgument(proxyAuthzID);
@@ -299,21 +315,28 @@
                                     MSGID_STOPDS_DESCRIPTION_TRUST_ALL);
      argParser.addArgument(trustAll);

      keyStoreFile = new StringArgument("keystorefile", 'K', "keyStoreFile",
                                        false, false, true, "{keyStoreFile}",
      keyStoreFile = new StringArgument("keystorefile",
                                        OPTION_SHORT_KEYSTOREPATH,
                                        OPTION_LONG_KEYSTOREPATH,
                                        false, false, true,
                                        OPTION_VALUE_KEYSTOREPATH,
                                        null, null,
                                        MSGID_STOPDS_DESCRIPTION_KSFILE);
      argParser.addArgument(keyStoreFile);

      keyStorePW = new StringArgument("keystorepw", 'W', "keyStorePassword",
                                      false, false, true, "{keyStorePassword}",
      keyStorePW = new StringArgument("keystorepw", OPTION_SHORT_KEYSTORE_PWD,
                                      OPTION_LONG_KEYSTORE_PWD,
                                      false, false, true,
                                      OPTION_VALUE_KEYSTORE_PWD,
                                      null, null,
                                      MSGID_STOPDS_DESCRIPTION_KSPW);
      argParser.addArgument(keyStorePW);

      keyStorePWFile = new FileBasedArgument("keystorepwfile", 'u',
                                             "keyStorePasswordFile", false,
                                             false, "{keyStorePasswordFile}",
      keyStorePWFile = new FileBasedArgument("keystorepwfile",
                                             OPTION_SHORT_KEYSTORE_PWD_FILE,
                                             OPTION_LONG_KEYSTORE_PWD_FILE,
                                             false, false,
                                             OPTION_VALUE_KEYSTORE_PWD_FILE,
                                             null, null,
                                             MSGID_STOPDS_DESCRIPTION_KSPWFILE);
      argParser.addArgument(keyStorePWFile);
@@ -323,25 +346,32 @@
                                        null, MSGID_DESCRIPTION_CERT_NICKNAME);
      argParser.addArgument(certNickname);

      trustStoreFile = new StringArgument("truststorefile", 'P',
                                          "trustStoreFile", false, false, true,
                                          "{trustStoreFile}", null, null,
      trustStoreFile = new StringArgument("truststorefile",
                                          OPTION_SHORT_TRUSTSTOREPATH,
                                          OPTION_LONG_TRUSTSTOREPATH,
                                          false, false, true,
                                          OPTION_VALUE_TRUSTSTOREPATH,
                                          null, null,
                                          MSGID_STOPDS_DESCRIPTION_TSFILE);
      argParser.addArgument(trustStoreFile);

      trustStorePW = new StringArgument("truststorepw", 'T',
                                        "trustStorePassword", false, false,
                                        true, "{trustStorePassword}", null,
                                        OPTION_LONG_TRUSTSTORE_PWD,
                                        false, false,
                                        true, OPTION_VALUE_TRUSTSTORE_PWD, null,
                                        null, MSGID_STOPDS_DESCRIPTION_TSPW);
      argParser.addArgument(trustStorePW);

      trustStorePWFile = new FileBasedArgument("truststorepwfile", 'U',
                                  "trustStorePasswordFile", false, false,
                                  "{trustStorePasswordFile}", null, null,
      trustStorePWFile = new FileBasedArgument("truststorepwfile",
                                  OPTION_SHORT_TRUSTSTORE_PWD_FILE,
                                  OPTION_LONG_TRUSTSTORE_PWD_FILE,
                                  false, false,
                                  OPTION_VALUE_TRUSTSTORE_PWD_FILE, null, null,
                                  MSGID_STOPDS_DESCRIPTION_TSPWFILE);
      argParser.addArgument(trustStorePWFile);

      showUsage = new BooleanArgument("showusage", 'H', "help",
      showUsage = new BooleanArgument("showusage", OPTION_SHORT_HELP,
                                      OPTION_LONG_HELP,
                                      MSGID_STOPDS_DESCRIPTION_SHOWUSAGE);
      argParser.addArgument(showUsage);
      argParser.setUsageArgument(showUsage, out);

 opendj-sdk/opends/src/server/org/opends/server/tools/ToolConstants.java

@@ -87,5 +87,375 @@
   * for a SASL ANONYMOUS request.
   */
  public static final String SASL_PROPERTY_TRACE = "trace";


  /**
   * The value for the short option configClass.
   */
  public static final char OPTION_SHORT_CONFIG_CLASS = 'C';

  /**
   * The value for the long option configClass.
   */
  public static final String OPTION_LONG_CONFIG_CLASS = "configClass";

  /**
   * The placeholder value of configClass that will be displayed in usage
   * information.
   */
  public static final String OPTION_VALUE_CONFIG_CLASS = "{configClass}";

  /**
   * The value for the short option hostname.
   */
  public static final char OPTION_SHORT_HOST = 'h';

  /**
   * The value for the long option hostname.
   */
  public static final String OPTION_LONG_HOST = "hostname";

  /**
   * The placeholder value of hostname that will be displayed in usage
   * information.
   */
  public static final String OPTION_VALUE_HOST = "{host}";

  /**
   * The value for the short option port.
   */
  public static final char OPTION_SHORT_PORT = 'p';

  /**
   * The value for the long option port.
   */
  public static final String OPTION_LONG_PORT = "port";

  /**
   * The placeholder value of port that will be displayed in usage
   * information.
   */
  public static final String OPTION_VALUE_PORT = "{port}";

  /**
   * The value for the short option useSSL.
   */
  public static final char OPTION_SHORT_USE_SSL = 'Z';

  /**
   * The value for the long option useSSL.
   */
  public static final String OPTION_LONG_USE_SSL = "useSSL";

  /**
   * The value for the short option baseDN.
   */
  public static final char OPTION_SHORT_BASEDN = 'b';

  /**
   * The value for the long option baseDN.
   */
  public static final String OPTION_LONG_BASEDN = "baseDN";

  /**
   * The placeholder value of baseDN that will be displayed in usage
   * information.
   */
  public static final String OPTION_VALUE_BASEDN = "{baseDN}";

  /**
   * The value for the short option rootUserDN.
   */
  public static final char OPTION_SHORT_ROOT_USER_DN = 'D';

  /**
   * The value for the long option rootUserDN.
   */
  public static final String OPTION_LONG_ROOT_USER_DN = "rootUserDN";

  /**
   * The placeholder value of hostname that will be displayed in usage
   * information.
   */
  public static final String OPTION_VALUE_ROOT_USER_DN = "{rootUserDN}";

  /**
   * The value for the short option bindDN.
   */
  public static final char OPTION_SHORT_BINDDN = 'D';

  /**
   * The value for the long option bindDN.
   */
  public static final String OPTION_LONG_BINDDN = "bindDN";

  /**
   * The placeholder value of bindDN that will be displayed in usage
   * information.
   */
  public static final String OPTION_VALUE_BINDDN = "{bindDN}";

  /**
   * The value for the short option bindPassword.
   */
  public static final char OPTION_SHORT_BINDPWD = 'w';

  /**
   * The value for the long option bindPassword.
   */
  public static final String OPTION_LONG_BINDPWD = "bindPassword";

  /**
   * The placeholder value of bindPassword that will be displayed in usage
   * information.
   */
  public static final String OPTION_VALUE_BINDPWD = "{bindPassword}";

  /**
   * The value for the short option bindPasswordFile.
   */
  public static final char OPTION_SHORT_BINDPWD_FILE = 'j';

  /**
   * The value for the long option bindPasswordFile.
   */
  public static final String OPTION_LONG_BINDPWD_FILE = "bindPasswordFile";

  /**
   * The placeholder value of bindPasswordFile that will be displayed in usage
   * information.
   */
  public static final String OPTION_VALUE_BINDPWD_FILE = "{bindPasswordFile}";


  /**
   * The value for the short option compress.
   */
  public static final char OPTION_SHORT_COMPRESS = 'c';

  /**
   * The value for the long option compress.
   */
  public static final String OPTION_LONG_COMPRESS = "compress";

  /**
   * The value for the short option filename.
   */
  public static final char OPTION_SHORT_FILENAME = 'f';

  /**
   * The value for the long option filename.
   */
  public static final String OPTION_LONG_FILENAME = "filename";

  /**
   * The placeholder value of filename that will be displayed in usage
   * information.
   */
  public static final String OPTION_VALUE_FILENAME = "{filemane}";

  /**
   * The value for the short option ldifFile.
   */
  public static final char OPTION_SHORT_LDIF_FILE = 'l';

  /**
   * The value for the long option ldifFile.
   */
  public static final String OPTION_LONG_LDIF_FILE = "ldifFile";

  /**
   * The placeholder value of ldifFile that will be displayed in usage
   * information.
   */
  public static final String OPTION_VALUE_LDIF_FILE = "{ldifFile}";

  /**
   * The value for the short option useStartTLS.
   */
  public static final char OPTION_SHORT_START_TLS = 'q';

  /**
   * The value for the long option useStartTLS.
   */
  public static final String OPTION_LONG_START_TLS = "useStartTLS";

  /**
   * The value for the short option randomSeed.
   */
  public static final char OPTION_SHORT_RANDOM_SEED = 's';

  /**
   * The value for the long option randomSeed.
   */
  public static final String OPTION_LONG_RANDOM_SEED = "randomSeed";

  /**
   * The placeholder value of randomSeed that will be displayed in usage
   * information.
   */
  public static final String OPTION_VALUE_RANDOM_SEED = "{seed}";

  /**
   * The value for the short option keyStorePath.
   */
  public static final char OPTION_SHORT_KEYSTOREPATH = 'K';

  /**
   * The value for the long option keyStorePath.
   */
  public static final String OPTION_LONG_KEYSTOREPATH = "keyStorePath";

  /**
   * The placeholder value of keyStorePath that will be displayed in usage
   * information.
   */
  public static final String OPTION_VALUE_KEYSTOREPATH = "{keyStorePath}";

  /**
   * The value for the short option trustStorePath.
   */
  public static final char OPTION_SHORT_TRUSTSTOREPATH = 'P';

  /**
   * The value for the long option trustStorePath.
   */
  public static final String OPTION_LONG_TRUSTSTOREPATH = "trustStorePath";

  /**
   * The placeholder value of trustStorePath that will be displayed in usage
   * information.
   */
  public static final String OPTION_VALUE_TRUSTSTOREPATH = "{trustStorePath}";

  /**
   * The value for the short option keyStorePassword.
   */
  public static final char OPTION_SHORT_KEYSTORE_PWD = 'W';

  /**
   * The value for the long option keyStorePassword.
   */
  public static final String OPTION_LONG_KEYSTORE_PWD = "keyStorePassword";

  /**
   * The placeholder value of keyStorePassword that will be displayed in usage
   * information.
   */
  public static final String OPTION_VALUE_KEYSTORE_PWD = "{keyStorePassword}";

  /**
   * The value for the long option trustStorePassword.
   */
  public static final String OPTION_LONG_TRUSTSTORE_PWD = "trustStorePassword";

  /**
   * The placeholder value of trustStorePassword that will be displayed in usage
   * information.
   */
  public static final String OPTION_VALUE_TRUSTSTORE_PWD =
    "{trustStorePassword}";

  /**
   * The value for the short option keyStorePasswordFile .
   */
  public static final char OPTION_SHORT_KEYSTORE_PWD_FILE = 'u';

  /**
   * The value for the long option keyStorePasswordFile .
   */
  public static final String OPTION_LONG_KEYSTORE_PWD_FILE =
    "keyStorePasswordFile ";

  /**
   * The placeholder value of keyStorePasswordFile that will be
   * displayed in usage information.
   */
  public static final String OPTION_VALUE_KEYSTORE_PWD_FILE = "{path}";

  /**
   * The value for the short option keyStorePasswordFile .
   */
  public static final char OPTION_SHORT_TRUSTSTORE_PWD_FILE = 'U';

  /**
   * The value for the long option keyStorePasswordFile .
   */
  public static final String OPTION_LONG_TRUSTSTORE_PWD_FILE =
    "TrustStorePasswordFile ";

  /**
   * The placeholder value of keyStorePasswordFile that will be
   * displayed in usage information.
   */
  public static final String OPTION_VALUE_TRUSTSTORE_PWD_FILE = "{path}";

  /**
   * The value for the long option assertionFilter .
   */
  public static final String OPTION_LONG_ASSERTION_FILE = "assertionFilter";

  /**
   * The placeholder value of assertionFilter  that will be displayed in usage
   * information.
   */
  public static final String OPTION_VALUE_ASSERTION_FILE = "{filter}";

  /**
   * The value for the short option dry-run.
   */
  public static final char OPTION_SHORT_DRYRUN = 'n';

  /**
   * The value for the long option dry-run.
   */
  public static final String OPTION_LONG_DRYRUN = "dry-run";

  /**
   * The value for the short option help.
   */
  public static final char OPTION_SHORT_HELP = 'H';

  /**
   * The value for the long option help.
   */
  public static final String OPTION_LONG_HELP = "help";

  /**
   * The value for the long option cli.
   */
  public static final String OPTION_LONG_CLI = "cli";

  /**
   * The value for the short option proxyAs.
   */
  public static final char OPTION_SHORT_PROXYAUTHID = 'Y';

  /**
   * The value for the long option proxyAs.
   */
  public static final String OPTION_LONG_PROXYAUTHID = "proxyAs";

  /**
   * The placeholder value of proxyAs  that will be
   * displayed in usage information.
   */
  public static final String OPTION_VALUE_PROXYAUTHID = "{authzID}";

  /**
   * The value for the short option saslOption.
   */
  public static final char OPTION_SHORT_SASLOPTION = 'o';

  /**
   * The value for the long option saslOption.
   */
  public static final String OPTION_LONG_SASLOPTION = "saslOption";

  /**
   * The placeholder value of saslOption that will be
   * displayed in usage information.
   */
  public static final String OPTION_VALUE_SASLOPTION = "{name=value}";
}


 opendj-sdk/opends/src/server/org/opends/server/tools/VerifyIndex.java

@@ -60,6 +60,7 @@
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;



@@ -99,8 +100,9 @@
    try
    {
      configClass =
           new StringArgument("configclass", 'C', "configClass", true, false,
                              true, "{configClass}",
           new StringArgument("configclass", OPTION_SHORT_CONFIG_CLASS,
                              OPTION_LONG_CONFIG_CLASS, true, false,
                              true, OPTION_VALUE_CONFIG_CLASS,
                              ConfigFileHandler.class.getName(), null,
                              MSGID_VERIFYINDEX_DESCRIPTION_CONFIG_CLASS);
      configClass.setHidden(true);
@@ -116,8 +118,9 @@


      baseDNString =
           new StringArgument("basedn", 'b', "baseDN", true, false, true,
                              "{baseDN}", null, null,
           new StringArgument("basedn", OPTION_SHORT_BASEDN,
                              OPTION_LONG_BASEDN, true, false, true,
                              OPTION_VALUE_BASEDN, null, null,
                              MSGID_VERIFYINDEX_DESCRIPTION_BASE_DN);
      argParser.addArgument(baseDNString);

@@ -136,7 +139,7 @@


      displayUsage =
           new BooleanArgument("help", 'H', "help",
           new BooleanArgument("help", OPTION_SHORT_HELP, OPTION_LONG_HELP,
                               MSGID_VERIFYINDEX_DESCRIPTION_USAGE);
      argParser.addArgument(displayUsage);
      argParser.setUsageArgument(displayUsage);

 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIF.java

@@ -48,6 +48,7 @@
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;



@@ -136,8 +137,10 @@
      argParser.addArgument(configFile);


      configClass = new StringArgument("configclass", 'C', "configClass", false,
                                       false, true, "{configClass}", null, null,
      configClass = new StringArgument("configclass", OPTION_SHORT_CONFIG_CLASS,
                                       OPTION_LONG_CONFIG_CLASS, false,
                                       false, true,
                                       OPTION_VALUE_CONFIG_CLASS, null, null,
                                       MSGID_MAKELDIF_DESCRIPTION_CONFIG_CLASS);
      configClass.setHidden(true);
      argParser.addArgument(configClass);
@@ -163,13 +166,16 @@
      argParser.addArgument(ldifFile);


      randomSeed = new IntegerArgument("randomseed", 's', "randomSeed", false,
                                       false, true, "{seed}", 0, null,
      randomSeed = new IntegerArgument("randomseed", OPTION_SHORT_RANDOM_SEED,
                                       OPTION_LONG_RANDOM_SEED, false,
                                       false, true, OPTION_VALUE_RANDOM_SEED,
                                       0, null,
                                       MSGID_MAKELDIF_DESCRIPTION_SEED);
      argParser.addArgument(randomSeed);


      showUsage = new BooleanArgument("help", 'H', "help",
      showUsage = new BooleanArgument("help", OPTION_SHORT_HELP,
                                      OPTION_LONG_HELP,
                                      MSGID_MAKELDIF_DESCRIPTION_HELP);
      argParser.addArgument(showUsage);
      argParser.setUsageArgument(showUsage);

 opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java

@@ -1020,6 +1020,7 @@
      // Write a line with the short and/or long identifiers that may be used
      // for the argument.
      Character shortID = a.getShortIdentifier();
      String longID = a.getLongIdentifier();
      if (shortID != null)
      {
        int currentLength = buffer.length();
@@ -1027,17 +1028,16 @@
        buffer.append("-");
        buffer.append(shortID.charValue());

        if (a.needsValue())
        if (a.needsValue() && longID == null)
        {
          buffer.append(" ");
          buffer.append(a.getValuePlaceholder());
        }

        String longID = a.getLongIdentifier();
        if (longID != null)
        {
          StringBuilder newBuffer = new StringBuilder();
          newBuffer.append("or   --");
          newBuffer.append(", --");
          newBuffer.append(longID);

          if (a.needsValue())
@@ -1046,7 +1046,7 @@
            newBuffer.append(a.getValuePlaceholder());
          }

          int lineLength = (buffer.length() - currentLength) + 2 +
          int lineLength = (buffer.length() - currentLength) +
                           newBuffer.length();
          if (lineLength > 80)
          {
@@ -1055,7 +1055,6 @@
          }
          else
          {
            buffer.append("  ");
            buffer.append(newBuffer.toString());
          }
        }
@@ -1064,7 +1063,6 @@
      }
      else
      {
        String longID = a.getLongIdentifier();
        if (longID != null)
        {
          buffer.append("--");

 opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java

@@ -1215,7 +1215,7 @@
        String longIDString = a.getLongIdentifier();
        if (longIDString != null)
        {
          buffer.append("  or  --");
          buffer.append(", --");
          buffer.append(longIDString);
          buffer.append(value);
        }
@@ -1320,7 +1320,7 @@
        if (longID != null)
        {
          StringBuilder newBuffer = new StringBuilder();
          newBuffer.append("or   --");
          newBuffer.append(", --");
          newBuffer.append(longID);

          if (a.needsValue())

 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusCli.java

@@ -46,6 +46,8 @@
import org.opends.statuspanel.ui.DatabasesTableModel;
import org.opends.statuspanel.ui.ListenersTableModel;

import static org.opends.server.tools.ToolConstants.*;

/**
 * The class used to provide some CLI interface to display status.
 *
@@ -152,8 +154,8 @@
          }
        }
      }
      else if (args[i].equals("-w") ||
          args[i].equalsIgnoreCase("--bindPassword"))
      else if (args[i].equals("-" + OPTION_SHORT_BINDPWD) ||
          args[i].equalsIgnoreCase("--" + OPTION_LONG_BINDPWD))
      {
        if (i+1 >= args.length)
        {

 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/resources/Resources.properties

@@ -35,7 +35,7 @@
which displays basic server information and will allow you to start, stop and \
restart the server.\n\
Usage:  {0} {options}\n        where {options} include:\n\
-H  or   --help\n    Displays usage information for this program.
-H, --help\n    Display this usage information.
status-panel-launcher-gui-launch-failed=Could not launch Status Panel.  Check \
that you have access to the display.

@@ -163,11 +163,11 @@
it and that it contains a password. 
status-cli-usage=This command displays basic server information.\n\n\
Usage:  {0} {options}\n        where {options} include:\n\
-D {bindDN}  or   --bindDN {bindDN}\n    Bind DN\n\
-w {bindPassword}  or   --bindPassword {bindPassword}\n    Bind password\n\
-j {bindPasswordFile}  or   --bindPasswordFile {bindPasswordFile}\n    Bind \
-D {bindDN}, --bindDN {bindDN}\n    Bind DN\n\
-w {bindPassword}, --bindPassword {bindPassword}\n    Bind password\n\
-j {bindPasswordFile}, --bindPasswordFile {bindPasswordFile}\n    Bind \
password file\n\
-H  or   --help\n    Display this usage information.
-H , --help\n    Display this usage information.
not-available-authentication-required-cli-label=<not available> (*)
not-available-authentication-required-cli-legend=* Information only available \
if you provide authentication information when launching the status \

 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java

@@ -847,7 +847,7 @@


  /**
   * Tests a simple modify operation using the --noop client-side option.
   * Tests a simple modify operation using the --dry-run client-side option.
   *
   * @throws  Exception  If an unexpected problem occurs.
   */
@@ -863,7 +863,7 @@
      "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
      "-D", "cn=Directory Manager",
      "-w", "password",
      "--noop",
      "--dry-run",
      "-f", modifyFilePath
    };

@@ -873,7 +873,7 @@


  /**
   * Tests a simple add operation using the --noop client-side option.
   * Tests a simple add operation using the --dry-run client-side option.
   *
   * @throws  Exception  If an unexpected problem occurs.
   */
@@ -896,7 +896,7 @@
      "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
      "-D", "cn=Directory Manager",
      "-w", "password",
      "--noop",
      "--dry-run",
      "-f", path
    };

@@ -906,7 +906,7 @@


  /**
   * Tests a simple delete operation using the --noop client-side option.
   * Tests a simple delete operation using the --dry-run client-side option.
   *
   * @throws  Exception  If an unexpected problem occurs.
   */
@@ -926,7 +926,7 @@
      "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
      "-D", "cn=Directory Manager",
      "-w", "password",
      "--noop",
      "--dry-run",
      "-f", path
    };

@@ -936,7 +936,7 @@


  /**
   * Tests a simple modify DN operation using the --noop client-side option.
   * Tests a simple modify DN operation using the --dry-run client-side option.
   *
   * @throws  Exception  If an unexpected problem occurs.
   */
@@ -958,7 +958,7 @@
      "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
      "-D", "cn=Directory Manager",
      "-w", "password",
      "--noop",
      "--dry-run",
      "-f", path
    };


 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java

@@ -566,7 +566,7 @@


  /**
   * Tests a simple invocation using the "--noop" option with a valid argument
   * Tests a simple invocation using the "--dry-run" option with a valid argument
   * set.
   */
  @Test()
@@ -581,7 +581,7 @@
      "-w", "password",
      "-b", "",
      "-s", "base",
      "--noop",
      "--dry-run",
      "(objectClass=*)"
    };

@@ -591,7 +591,7 @@


  /**
   * Tests a simple invocation using the "--noop" option with an invalid
   * Tests a simple invocation using the "--dry-run" option with an invalid
   * argument set.
   */
  @Test()
@@ -606,7 +606,7 @@
      "-w", "password",
      "-b", "",
      "-s", "invalid",
      "--noop",
      "--dry-run",
      "(objectClass=*)"
    };