Fix for issue 2188:

jvergara

29.31.2007 f4db169cefe0d0d3e1685f1da77e0a3676b98284

Fix for issue 2188:

Define some new constants in ToolConstants that are used by SecureConnectionCliParser.  This way all the utilities using this class will benefit of the fix.

Note: this fix adds short options so the interface change does not break any tool that might be using the impacting commands.

 opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java

@@ -423,8 +423,8 @@
        INFO_DESCRIPTION_BINDPASSWORDFILE.get());
    set.add(bindPasswordFileArg);

    trustAllArg = new BooleanArgument("trustAll", 'X', "trustAll",
        INFO_DESCRIPTION_TRUSTALL.get());
    trustAllArg = new BooleanArgument("trustAll", OPTION_SHORT_TRUSTALL,
        OPTION_LONG_TRUSTALL, INFO_DESCRIPTION_TRUSTALL.get());
    set.add(trustAllArg);

    trustStorePathArg = new StringArgument("trustStorePath",
@@ -433,13 +433,13 @@
        INFO_DESCRIPTION_TRUSTSTOREPATH.get());
    set.add(trustStorePathArg);

    trustStorePasswordArg = new StringArgument("trustStorePassword", null,
        OPTION_LONG_TRUSTSTORE_PWD, false, false, true,
        OPTION_VALUE_TRUSTSTORE_PWD, null, null,
    trustStorePasswordArg = new StringArgument("trustStorePassword",
        OPTION_SHORT_TRUSTSTORE_PWD, OPTION_LONG_TRUSTSTORE_PWD, false, false,
        true, OPTION_VALUE_TRUSTSTORE_PWD, null, null,
        INFO_DESCRIPTION_TRUSTSTOREPASSWORD.get());
    set.add(trustStorePasswordArg);

    trustStorePasswordFileArg = new FileBasedArgument("truststorePasswordFile",
    trustStorePasswordFileArg = new FileBasedArgument("trustStorePasswordFile",
        OPTION_SHORT_TRUSTSTORE_PWD_FILE, OPTION_LONG_TRUSTSTORE_PWD_FILE,
        false, false, OPTION_VALUE_TRUSTSTORE_PWD_FILE, null, null,
        INFO_DESCRIPTION_TRUSTSTOREPASSWORD_FILE.get());
@@ -451,7 +451,8 @@
        INFO_DESCRIPTION_KEYSTOREPATH.get());
    set.add(keyStorePathArg);

    keyStorePasswordArg = new StringArgument("keyStorePassword", null,
    keyStorePasswordArg = new StringArgument("keyStorePassword",
        OPTION_SHORT_KEYSTORE_PWD,
        OPTION_LONG_KEYSTORE_PWD, false, false, true,
        OPTION_VALUE_KEYSTORE_PWD, null, null,
        INFO_DESCRIPTION_KEYSTOREPASSWORD.get());
@@ -463,13 +464,14 @@
        INFO_DESCRIPTION_KEYSTOREPASSWORD_FILE.get());
    set.add(keyStorePasswordFileArg);

    certNicknameArg = new StringArgument("certnickname", 'N', "certNickname",
        false, false, true, "{nickname}", null, null,
    certNicknameArg = new StringArgument("certNickname",
        OPTION_SHORT_CERT_NICKNAME, OPTION_LONG_CERT_NICKNAME,
        false, false, true, OPTION_VALUE_CERT_NICKNAME, null, null,
        INFO_DESCRIPTION_CERT_NICKNAME.get());
    set.add(certNicknameArg);

    verboseArg = new BooleanArgument("verbose", 'v', "verbose",
        INFO_DESCRIPTION_VERBOSE.get());
    verboseArg = new BooleanArgument("verbose", OPTION_SHORT_VERBOSE,
        OPTION_LONG_VERBOSE, INFO_DESCRIPTION_VERBOSE.get());
    set.add(verboseArg);

    return set;

 opends/src/server/org/opends/server/tools/ToolConstants.java

@@ -345,6 +345,11 @@
  public static final String OPTION_VALUE_KEYSTORE_PWD = "{keyStorePassword}";

  /**
   * The value for the short option trustStorePassword.
   */
  public static final char OPTION_SHORT_TRUSTSTORE_PWD = 'T';

  /**
   * The value for the long option trustStorePassword.
   */
  public static final String OPTION_LONG_TRUSTSTORE_PWD = "trustStorePassword";
@@ -391,6 +396,32 @@
  public static final String OPTION_VALUE_TRUSTSTORE_PWD_FILE = "{path}";

  /**
   * The value for the short option trustAll .
   */
  public static final char OPTION_SHORT_TRUSTALL = 'X';

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

  /**
   * The value for the short option certNickname .
   */
  public static final char OPTION_SHORT_CERT_NICKNAME = 'N';

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

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

  /**
   * The value for the long option assertionFilter .
   */
  public static final String OPTION_LONG_ASSERTION_FILE = "assertionFilter";
@@ -666,6 +697,14 @@
   */
  public static final String OPTION_LONG_NO_PROMPT = "no-prompt";

  /**
   * Value for verbose option short form.
   */
  public static final Character OPTION_SHORT_VERBOSE = 'v';

  /**
   * Value for verbose option long form.
   */
  public static final String OPTION_LONG_VERBOSE = "verbose";
}