Fix for issue 3516 (dsconfig --displayCommand issue)

jvergara

15.05.2008 f65afa43e21b41473a5af55693313c07c78073a6

Fix for issue 3516 (dsconfig --displayCommand issue)

Only add the trustStorePassword parameter if the user actually provides it.

Do not display the --advanced option in the equivalent command since it makes no sense in not-interactive mode.

 opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java

@@ -1004,11 +1004,6 @@
    CommandBuilder commandBuilder =
      new CommandBuilder(commandName, handler.getSubCommand().getName());

    if (advancedModeArgument.isPresent())
    {
      commandBuilder.addArgument(advancedModeArgument);
    }

    commandBuilder.append(handler.getCommandBuilder());

    if ((factory != null) && (factory.getContextCommandBuilder() != null))

 opends/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java

@@ -978,7 +978,8 @@
        truststore.load(null, null);
      }

      if (secureArgsList.trustStorePasswordFileArg.isPresent())
      if (secureArgsList.trustStorePasswordFileArg.isPresent() &&
          (truststorePath != null))
      {
        copySecureArgsList.trustStorePasswordFileArg.clearValues();
        copySecureArgsList.trustStorePasswordFileArg.getNameToValueMap().putAll(
@@ -986,8 +987,10 @@
        commandBuilder.addArgument(
            copySecureArgsList.trustStorePasswordFileArg);
      }
      else
      else if ((truststorePassword != null) && (truststorePath != null))
      {
        // Only add the trust store password if there is one AND if the user
        // specified a trust store path.
        copySecureArgsList.trustStorePasswordArg.clearValues();
        copySecureArgsList.trustStorePasswordArg.addValue(truststorePassword);
        commandBuilder.addObfuscatedArgument(
@@ -1213,7 +1216,7 @@
      commandBuilder.addArgument(
          copySecureArgsList.keyStorePasswordFileArg);
    }
    else
    else if (keystorePassword != null)
    {
      copySecureArgsList.keyStorePasswordArg.clearValues();
      copySecureArgsList.keyStorePasswordArg.addValue(keystorePassword);