Checkpoint OPENDJ-1343 Migrate dsconfig - Replaced org.opends.messages.DSCo...

Violette Roche-Montane

24.33.2014 1bd1dffc1e5f3565b89df69658fae789be40412b

Checkpoint OPENDJ-1343 Migrate dsconfig
- Replaced org.opends.messages.DSConfigMessages.* by com.forgerock.opendj.dsconfig.DsconfigMessages.*;
- Replaced org.opends.messages.ToolMessages.* by com.forgerock.opendj.cli.CliMessages.*;

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

@@ -26,9 +26,7 @@
 */
package org.opends.server.tools.dsconfig;



import static org.opends.messages.DSConfigMessages.*;
import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;

import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.AbstractManagedObjectDefinition;

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

@@ -28,12 +28,9 @@



import static com.forgerock.opendj.cli.CliMessages.*;
import static com.forgerock.opendj.cli.ArgumentConstants.LIST_TABLE_SEPARATOR;
import static org.opends.messages.DSConfigMessages.*;
import static org.opends.messages.ToolMessages.INFO_NAME_PLACEHOLDER;
import static org.opends.messages.ToolMessages.INFO_PROPERTY_PLACEHOLDER;
import static org.opends.messages.ToolMessages.INFO_TYPE_PLACEHOLDER;
import static org.opends.messages.ToolMessages.INFO_VALUE_SET_PLACEHOLDER;
import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.
displayMissingMandatoryPropertyException;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.

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

@@ -26,8 +26,6 @@
 */
package org.opends.server.tools.dsconfig;



import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.CliMessages.*;
import static com.forgerock.opendj.cli.Utils.SHELL_COMMENT_SEPARATOR;
@@ -37,11 +35,7 @@
import static com.forgerock.opendj.cli.Utils.getCurrentOperationDateMessage;
import static com.forgerock.opendj.util.StaticUtils.stackTraceToSingleLineString;
import static org.forgerock.util.Utils.closeSilently;
import static org.opends.messages.DSConfigMessages.*;
import static org.opends.messages.ToolMessages.ERR_DSCFG_ERROR_BATCH_FILE_AND_INTERACTIVE_INCOMPATIBLE;
import static org.opends.messages.ToolMessages.ERR_DSCFG_ERROR_QUIET_AND_INTERACTIVE_INCOMPATIBLE;
import static org.opends.messages.ToolMessages.INFO_CONFIGDS_TOOL_DESCRIPTION;
import static org.opends.messages.ToolMessages.INFO_DESCRIPTION_CONFIG_OPTIONS_ARGS;
import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.displayManagedObjectDecodingException;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.displayMissingMandatoryPropertyException;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.displayOperationRejectedException;
@@ -454,7 +448,7 @@
    super(new PrintStream(out), new PrintStream(err));

    this.parser = new SubCommandArgumentParser(getClass().getName(),
        INFO_CONFIGDS_TOOL_DESCRIPTION.get(), false);
        INFO_DSCFG_TOOL_DESCRIPTION.get(), false);

    this.factory = factory;
  }
@@ -564,7 +558,7 @@
      // Register the global arguments.

      ArgumentGroup toolOptionsGroup = new ArgumentGroup(
          INFO_DESCRIPTION_CONFIG_OPTIONS_ARGS.get(), 2);
          INFO_DSCFG_DESCRIPTION_OPTIONS_ARGS.get(), 2);
      parser.addGlobalArgument(advancedModeArgument, toolOptionsGroup);

      parser.addGlobalArgument(showUsageArgument);
@@ -706,7 +700,7 @@

    if (batchFileArgument.isPresent() && !noPromptArgument.isPresent()) {
      LocalizableMessage message =
        ERR_DSCFG_ERROR_BATCH_FILE_AND_INTERACTIVE_INCOMPATIBLE.get(
          ERR_DSCFG_ERROR_QUIET_AND_INTERACTIVE_INCOMPATIBLE.get(
            batchFileArgument.getLongIdentifier(), noPromptArgument
            .getLongIdentifier());
      displayMessageAndUsageReference(message);

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

@@ -26,9 +26,7 @@
 */
package org.opends.server.tools.dsconfig;



import static org.opends.messages.DSConfigMessages.*;
import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;

import java.util.List;
import java.util.SortedMap;

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

@@ -26,9 +26,7 @@
 */
package org.opends.server.tools.dsconfig;



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

import java.io.PrintStream;

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

@@ -26,11 +26,8 @@
 */
package org.opends.server.tools.dsconfig;



import static org.opends.messages.DSConfigMessages.*;
import static org.opends.messages.UtilityMessages.*;
import static org.opends.messages.ToolMessages.*;
import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
import static com.forgerock.opendj.cli.CliMessages.*;
import static com.forgerock.opendj.cli.Utils.MAX_LINE_WIDTH;

import java.io.PrintStream;

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

@@ -30,7 +30,7 @@

import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_LONG_HELP;
import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_SHORT_HELP;
import static org.opends.messages.DSConfigMessages.*;
import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
import static org.forgerock.util.Utils.closeSilently;

import java.security.GeneralSecurityException;

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

@@ -25,9 +25,7 @@
 */
package org.opends.server.tools.dsconfig;



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

import java.io.PrintStream;

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

@@ -26,9 +26,7 @@
 */
package org.opends.server.tools.dsconfig;



import static org.opends.messages.DSConfigMessages.*;
import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;

import java.util.ArrayList;
import java.util.Arrays;

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

@@ -26,7 +26,7 @@
 */
package org.opends.server.tools.dsconfig;

import static org.opends.messages.DSConfigMessages.*;
import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;

import java.text.NumberFormat;


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

@@ -27,10 +27,8 @@
 */
package org.opends.server.tools.dsconfig;

import static org.opends.messages.DSConfigMessages.*;
import static org.opends.messages.ToolMessages.INFO_NAME_PLACEHOLDER;
import static org.opends.messages.ToolMessages.INFO_PROPERTY_PLACEHOLDER;
import static org.opends.messages.ToolMessages.INFO_VALUE_SET_PLACEHOLDER;
import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
import static com.forgerock.opendj.cli.CliMessages.*;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.
displayMissingMandatoryPropertyException;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.

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

@@ -28,10 +28,8 @@



import static org.opends.messages.DSConfigMessages.*;
import static org.opends.messages.ToolMessages.INFO_NAME_PLACEHOLDER;
import static org.opends.messages.ToolMessages.INFO_PROPERTY_PLACEHOLDER;
import static org.opends.messages.ToolMessages.INFO_UNIT_PLACEHOLDER;
import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
import static com.forgerock.opendj.cli.CliMessages.*;

import java.io.PrintStream;
import java.util.ArrayList;

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

@@ -26,8 +26,6 @@
 */
package org.opends.server.tools.dsconfig;



import java.util.SortedSet;
import java.util.TreeSet;