Checkpoint for OPENDJ-1303 "opendj-cli" - replaced ToolConstants by Argumen...

Violette Roche-Montane

21.33.2014 0f8c0db941311b7e34f0abc3299385175b9051cb

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java

@@ -28,7 +28,6 @@
package org.opends.guitools.controlpanel;

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

import java.util.LinkedHashSet;


 opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java

@@ -60,7 +60,6 @@
import org.opends.quicksetup.util.Utils;
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
import org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode;
import org.opends.server.tools.ToolConstants;
import org.opends.server.tools.dsconfig.LDAPManagementContextFactory;
import org.opends.server.util.StaticUtils;

@@ -78,6 +77,7 @@
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
import static com.forgerock.opendj.cli.Utils.CONFIRMATION_MAX_TRIES;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

/**
 * The class used to provide some CLI interface in the uninstall.
@@ -1300,8 +1300,8 @@
          println();
          printErrorMessage(ERR_UNINSTALL_ERROR_UPDATING_REMOTE_FORCE.get(
              "--"+parser.getSecureArgsList().adminUidArg.getLongIdentifier(),
              "--"+ToolConstants.OPTION_LONG_BINDPWD,
              "--"+ToolConstants.OPTION_LONG_BINDPWD_FILE,
              "--"+OPTION_LONG_BINDPWD,
              "--"+OPTION_LONG_BINDPWD_FILE,
              exceptionMsg));
        }
        else
@@ -1311,8 +1311,8 @@
              ERR_UNINSTALL_ERROR_UPDATING_REMOTE_NO_FORCE.get(
                  "--"+
                  parser.getSecureArgsList().adminUidArg.getLongIdentifier(),
                  "--"+ToolConstants.OPTION_LONG_BINDPWD,
                  "--"+ToolConstants.OPTION_LONG_BINDPWD_FILE,
                  "--"+OPTION_LONG_BINDPWD,
                  "--"+OPTION_LONG_BINDPWD_FILE,
                  "--"+parser.forceOnErrorArg.getLongIdentifier(),
                  exceptionMsg));
        }
@@ -1472,8 +1472,8 @@
            ERR_UNINSTALL_ERROR_UPDATING_REMOTE_NO_FORCE.get(
              "--"+
              parser.getSecureArgsList().adminUidArg.getLongIdentifier(),
              "--"+ToolConstants.OPTION_LONG_BINDPWD,
              "--"+ToolConstants.OPTION_LONG_BINDPWD_FILE,
              "--"+OPTION_LONG_BINDPWD,
              "--"+OPTION_LONG_BINDPWD_FILE,
              "--"+parser.forceOnErrorArg.getLongIdentifier(),
              Utils.getMessageFromCollection(exceptionMsgs,
                  Constants.LINE_SEPARATOR));

 opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java

@@ -61,7 +61,6 @@
import org.opends.server.admin.std.client.RootCfgClient;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tools.ConfigureWindowsService;
import org.opends.server.tools.ToolConstants;
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.StaticUtils;

@@ -70,6 +69,7 @@
import static org.opends.messages.QuickSetupMessages.*;
import static org.opends.quicksetup.Step.*;
import static org.opends.quicksetup.util.Utils.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

import java.io.*;
import java.net.InetAddress;
@@ -2073,8 +2073,8 @@
            ERR_UNINSTALL_ERROR_UPDATING_REMOTE_NO_FORCE.get(
              "--"+
              parser.getSecureArgsList().adminUidArg.getLongIdentifier(),
              "--"+ToolConstants.OPTION_LONG_BINDPWD,
              "--"+ToolConstants.OPTION_LONG_BINDPWD_FILE,
              "--"+OPTION_LONG_BINDPWD,
              "--"+OPTION_LONG_BINDPWD_FILE,
              "--"+parser.forceOnErrorArg.getLongIdentifier(),
              ae.getMessageObject());
          throw new ApplicationException(ae.getType(), msg, ae);

 opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java

@@ -37,7 +37,7 @@
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
import org.opends.server.admin.client.cli.SecureConnectionCliParser;
import org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode;
import org.opends.server.tools.ToolConstants;


import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
@@ -47,7 +47,7 @@

import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

/**
 * Class used to parse and populate the arguments of the Uninstaller.
@@ -193,7 +193,7 @@
    defaultArgs.remove(secureArgsList.hostNameArg);
    defaultArgs.remove(secureArgsList.portArg);
    referencedHostNameArg = new StringArgument("referencedHostName",
        ToolConstants.OPTION_SHORT_HOST,
        OPTION_SHORT_HOST,
        OPTION_LONG_REFERENCED_HOST_NAME, false, false, true,
        INFO_HOST_PLACEHOLDER.get(),
        UserData.getDefaultHostName(), OPTION_LONG_REFERENCED_HOST_NAME,

 opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Launcher.java

@@ -31,8 +31,8 @@
import com.forgerock.opendj.cli.ArgumentParser;

import static org.opends.messages.QuickSetupMessages.*;
import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.util.DynamicConstants.PRINTABLE_VERSION_STRING;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

import org.opends.quicksetup.util.Utils;


 opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java

@@ -28,6 +28,7 @@

import static org.opends.messages.QuickSetupMessages.*;
import static org.opends.quicksetup.util.Utils.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
@@ -35,7 +36,6 @@
import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.quicksetup.*;
import org.opends.quicksetup.installer.InstallerHelper;
import org.opends.server.tools.ToolConstants;
import org.opends.server.util.SetupUtils;
import org.opends.server.util.StaticUtils;

@@ -155,7 +155,7 @@
      argList.toArray(args);
      if (noPropertiesFile)
      {
        args[argList.size()] = "--" + ToolConstants.OPTION_LONG_NO_PROP_FILE;
        args[argList.size()] = "--" + OPTION_LONG_NO_PROP_FILE;
      }
      ProcessBuilder pb = new ProcessBuilder(args);
      Map<String, String> env = pb.environment();

 opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java

@@ -34,9 +34,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;

import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.util.ServerConstants.MAX_LINE_WIDTH;
import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

import java.io.File;
import java.io.FileInputStream;

 opendj3-server-dev/src/server/org/opends/server/admin/client/cli/TaskScheduleArgs.java

@@ -27,7 +27,7 @@
package org.opends.server.admin.client.cli;

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

import java.text.ParseException;
import java.util.Collections;

 opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java

@@ -75,7 +75,7 @@

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;


 opendj3-server-dev/src/server/org/opends/server/tools/ConfigureDS.java

@@ -80,7 +80,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

/**
 * This class provides a very basic tool that can be used to configure some of
@@ -364,8 +364,8 @@
      argParser.setUsageArgument(showUsage);

      serverRoot = new StringArgument("serverRoot",
              ToolConstants.OPTION_SHORT_SERVER_ROOT,
              ToolConstants.OPTION_LONG_SERVER_ROOT,
              OPTION_SHORT_SERVER_ROOT,
              OPTION_LONG_SERVER_ROOT,
              false, false, true, INFO_SERVER_ROOT_DIR_PLACEHOLDER.get(), null,
              null, null);
      serverRoot.setHidden(true);

 opendj3-server-dev/src/server/org/opends/server/tools/ConfigureWindowsService.java

@@ -51,7 +51,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.MAX_LINE_WIDTH;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

/**
  * This class is used to configure the Windows service for this instance on

 opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java

@@ -27,7 +27,7 @@
package org.opends.server.tools;

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;


 opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java

@@ -68,7 +68,7 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;


 opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java

@@ -67,7 +67,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

import org.opends.server.tools.tasks.TaskTool;
import org.opends.server.admin.std.server.BackendCfg;

 opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java

@@ -33,7 +33,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;


 opendj3-server-dev/src/server/org/opends/server/tools/InstallDSArgumentParser.java

@@ -27,7 +27,7 @@
package org.opends.server.tools;

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

import java.util.Collection;
import java.util.HashSet;

 opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java

@@ -27,7 +27,6 @@
package org.opends.server.tools;

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

import java.io.File;
import java.util.LinkedHashSet;

 opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java

@@ -73,7 +73,7 @@

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;


 opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java

@@ -62,7 +62,7 @@

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;


 opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java

@@ -64,7 +64,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.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;


/**

 opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java

@@ -79,7 +79,7 @@

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;


 opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java

@@ -60,7 +60,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;

/**

 opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java

@@ -58,7 +58,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;


 opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java

@@ -69,7 +69,7 @@

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;


 opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java

@@ -72,7 +72,7 @@
import com.forgerock.opendj.cli.StringArgument;

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;


 opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java

@@ -50,7 +50,7 @@
import com.forgerock.opendj.cli.*;

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;


 opendj3-server-dev/src/server/org/opends/server/tools/ListBackends.java

@@ -63,7 +63,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;



@@ -492,7 +492,7 @@
        table.appendCell(buf.toString());
      }
      TextTablePrinter printer = new TextTablePrinter(out);
      printer.setColumnSeparator(ToolConstants.LIST_TABLE_SEPARATOR);
      printer.setColumnSeparator(LIST_TABLE_SEPARATOR);
      table.print(printer);
    }


 opendj3-server-dev/src/server/org/opends/server/tools/ManageAccount.java

@@ -64,7 +64,7 @@
import static org.opends.server.extensions.
                   PasswordPolicyStateExtendedOperation.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

import org.opends.server.util.EmbeddedUtils;


 opendj3-server-dev/src/server/org/opends/server/tools/ManageTasks.java

@@ -35,7 +35,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.DecodeException;

import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

import org.opends.server.tools.tasks.TaskClient;
import org.opends.server.tools.tasks.TaskEntry;

 opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java

@@ -67,7 +67,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

import org.opends.server.tools.tasks.TaskTool;
import org.opends.server.admin.std.server.BackendCfg;

 opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java

@@ -71,7 +71,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

/**
 * This class provides a tool that can send a request to the Directory Server

 opendj3-server-dev/src/server/org/opends/server/tools/ToolConstants.java

File was deleted

 opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java

@@ -29,7 +29,7 @@


import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;


 opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java

@@ -32,6 +32,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.admin.PropertyException.*;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.*;
import static com.forgerock.opendj.cli.ArgumentConstants.LIST_TABLE_SEPARATOR;

import java.util.Collection;
import java.util.Collections;
@@ -77,7 +78,6 @@
import org.opends.server.admin.client.OperationRejectedException;
import org.opends.server.admin.condition.Condition;
import org.opends.server.admin.condition.ContainsCondition;
import org.opends.server.tools.ToolConstants;

import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
@@ -328,7 +328,7 @@

      TextTablePrinter printer = new TextTablePrinter(app.getErrorStream());
      printer.setColumnWidth(1, 0);
      printer.setColumnSeparator(ToolConstants.LIST_TABLE_SEPARATOR);
      printer.setColumnSeparator(LIST_TABLE_SEPARATOR);
      builder.print(printer);
      app.println();
      app.pressReturnToContinue();

 opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java

@@ -32,7 +32,7 @@

import static org.opends.messages.DSConfigMessages.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.*;
import static org.opends.server.util.ServerConstants.PROPERTY_SCRIPT_NAME;
import static org.opends.server.util.StaticUtils.*;
@@ -569,10 +569,10 @@
          OPTION_LONG_NO_PROMPT,
          INFO_DESCRIPTION_NO_PROMPT.get());

      advancedModeArgument = new BooleanArgument(OPTION_DSCFG_LONG_ADVANCED,
          OPTION_DSCFG_SHORT_ADVANCED, OPTION_DSCFG_LONG_ADVANCED,
      advancedModeArgument = new BooleanArgument(OPTION_LONG_ADVANCED,
          null, OPTION_LONG_ADVANCED,
          INFO_DSCFG_DESCRIPTION_ADVANCED.get());
      advancedModeArgument.setPropertyName(OPTION_DSCFG_LONG_ADVANCED);
      advancedModeArgument.setPropertyName(OPTION_LONG_ADVANCED);

      showUsageArgument = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
          OPTION_LONG_HELP, INFO_DSCFG_DESCRIPTION_SHOW_GROUP_USAGE_SUMMARY
@@ -585,11 +585,11 @@
          INFO_DESCRIPTION_BATCH_FILE_PATH.get());

      displayEquivalentArgument = new BooleanArgument(
          OPTION_DSCFG_LONG_DISPLAY_EQUIVALENT,
          null, OPTION_DSCFG_LONG_DISPLAY_EQUIVALENT,
          OPTION_LONG_DISPLAY_EQUIVALENT,
          null, OPTION_LONG_DISPLAY_EQUIVALENT,
          INFO_DSCFG_DESCRIPTION_DISPLAY_EQUIVALENT.get());
      advancedModeArgument.setPropertyName(
          OPTION_DSCFG_LONG_DISPLAY_EQUIVALENT);
          OPTION_LONG_DISPLAY_EQUIVALENT);

      equivalentCommandFileArgument = new StringArgument(
          OPTION_LONG_EQUIVALENT_COMMAND_FILE_PATH, null,

 opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/GetPropSubCommandHandler.java

@@ -29,6 +29,7 @@


import static org.opends.messages.DSConfigMessages.*;
import static com.forgerock.opendj.cli.ArgumentConstants.LIST_TABLE_SEPARATOR;

import java.io.PrintStream;
import java.util.Collection;
@@ -61,7 +62,6 @@
import org.opends.server.admin.client.ManagedObject;
import org.opends.server.admin.client.ManagedObjectDecodingException;
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.tools.ToolConstants;

import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ReturnCode;
@@ -328,7 +328,7 @@
      builder.print(printer);
    } else {
      TextTablePrinter printer = new TextTablePrinter(out);
      printer.setColumnSeparator(ToolConstants.LIST_TABLE_SEPARATOR);
      printer.setColumnSeparator(LIST_TABLE_SEPARATOR);
      printer.setColumnWidth(1, 0);
      builder.print(printer);
    }

 opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java

@@ -44,7 +44,8 @@
import com.forgerock.opendj.cli.ClientException;

import org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode;
import org.opends.server.tools.ToolConstants;
import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_LONG_HELP;
import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_SHORT_HELP;
import com.forgerock.opendj.cli.CommandBuilder;
import com.forgerock.opendj.cli.ConsoleApplication;
import org.opends.server.util.cli.LDAPConnectionConsoleInteraction;
@@ -365,8 +366,8 @@
            // This is not a help command
            continue;
          }
          if (rawArg.contains(ToolConstants.OPTION_LONG_HELP) ||
            (rawArg.charAt(1) == ToolConstants.OPTION_SHORT_HELP) || (rawArg.
          if (rawArg.contains(OPTION_LONG_HELP) ||
            (rawArg.charAt(1) == OPTION_SHORT_HELP) || (rawArg.
            charAt(1) == '?')) {
            // used for usage help default values only
            secureArgsList.initArgumentsWithConfiguration();

 opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/ListSubCommandHandler.java

@@ -28,6 +28,7 @@


import static org.opends.messages.DSConfigMessages.*;
import static com.forgerock.opendj.cli.ArgumentConstants.LIST_TABLE_SEPARATOR;

import java.io.PrintStream;
import java.util.List;
@@ -53,7 +54,6 @@
import org.opends.server.admin.client.ManagedObject;
import org.opends.server.admin.client.ManagedObjectDecodingException;
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.tools.ToolConstants;

import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ReturnCode;
@@ -513,7 +513,7 @@
        }

        TextTablePrinter printer = new TextTablePrinter(out);
        printer.setColumnSeparator(ToolConstants.LIST_TABLE_SEPARATOR);
        printer.setColumnSeparator(LIST_TABLE_SEPARATOR);
        builder.print(printer);
      }
    }

 opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java

@@ -29,7 +29,7 @@

import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

import java.io.File;
import java.io.OutputStream;

 opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java

@@ -62,6 +62,7 @@
import static org.opends.quicksetup.util.Utils.getMessage;
import static org.opends.quicksetup.util.Utils.getMessageFromCollection;
import static org.opends.quicksetup.util.Utils.getServerClock;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

import org.opends.server.admin.*;
import org.opends.server.admin.client.ManagementContext;
@@ -75,7 +76,6 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tasks.PurgeConflictsHistoricalTask;
import org.opends.server.tools.ToolConstants;
import org.opends.server.tools.tasks.TaskEntry;
import org.opends.server.tools.tasks.TaskScheduleInteraction;
import org.opends.server.tools.tasks.TaskScheduleUserData;
@@ -147,7 +147,6 @@
    ERR_CONFIRMATION_TRIES_LIMIT_REACHED;
import static org.opends.quicksetup.util.Utils.getFirstValue;
import static org.opends.quicksetup.util.Utils.getThrowableMsg;
import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.tools.dsreplication.ReplicationCliReturnCode.*;
import static org.opends.server.util.StaticUtils.close;

@@ -583,7 +582,7 @@
          else
          {
            println(ERR_REPLICATION_VALID_SUBCOMMAND_NOT_FOUND.get(
                "--"+ToolConstants.OPTION_LONG_NO_PROMPT));
                "--"+OPTION_LONG_NO_PROMPT));
            println(LocalizableMessage.raw(argParser.getUsage()));
            returnValue = ERROR_USER_DATA;
            subcommandLaunched = false;
@@ -7718,7 +7717,7 @@
    {
      printer = new TextTablePrinter(out);
      ((TextTablePrinter)printer).setColumnSeparator(
        ToolConstants.LIST_TABLE_SEPARATOR);
        LIST_TABLE_SEPARATOR);
    }
    tableBuilder.print(printer);
  }
@@ -7788,7 +7787,7 @@

      printer = new TextTablePrinter(getOutputStream());
      ((TextTablePrinter)printer).setColumnSeparator(
        ToolConstants.LIST_TABLE_SEPARATOR);
        LIST_TABLE_SEPARATOR);
    }
    tableBuilder.print(printer);
  }

 opendj3-server-dev/src/server/org/opends/server/tools/makeldif/MakeLDIF.java

@@ -51,7 +51,7 @@
import com.forgerock.opendj.cli.StringArgument;

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;


 opendj3-server-dev/src/server/org/opends/server/tools/status/StatusCli.java

@@ -60,7 +60,6 @@
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
import org.opends.server.config.ConfigException;
import com.forgerock.opendj.cli.ClientException;
import org.opends.server.tools.ToolConstants;
import org.opends.server.tools.dsconfig.LDAPManagementContextFactory;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
@@ -79,6 +78,7 @@
import static org.opends.messages.QuickSetupMessages.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.quicksetup.util.Utils.*;
import static com.forgerock.opendj.cli.ArgumentConstants.LIST_TABLE_SEPARATOR;

/**
 * The class used to provide some CLI interface to display status.
@@ -1004,7 +1004,7 @@
        }
      }
      TextTablePrinter printer = new TextTablePrinter(getOutputStream());
      printer.setColumnSeparator(ToolConstants.LIST_TABLE_SEPARATOR);
      printer.setColumnSeparator(LIST_TABLE_SEPARATOR);
      table.print(printer);
    }
  }

 opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskTool.java

@@ -42,8 +42,6 @@
import org.opends.server.tools.LDAPConnection;
import org.opends.server.tools.LDAPConnectionException;

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

import org.opends.server.types.LDAPException;
import org.opends.server.types.OpenDsException;
import org.opends.server.util.args.LDAPConnectionArgumentParser;

 opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java

@@ -26,11 +26,11 @@
package org.opends.server.tools.upgrade;

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.util.StaticUtils.filterExitCode;
import static org.opends.server.tools.upgrade.FormattedNotificationCallback.*;
import static org.opends.server.tools.upgrade.Upgrade.EXIT_CODE_ERROR;
import static org.opends.server.tools.upgrade.Upgrade.EXIT_CODE_SUCCESS;
import static com.forgerock.opendj.cli.ArgumentConstants.*;

import java.io.IOException;
import java.io.InputStream;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java

@@ -40,7 +40,7 @@
import org.testng.annotations.Test;

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.testng.Assert.*;

/**