From 1bd1dffc1e5f3565b89df69658fae789be40412b Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 24 Mar 2014 10:33:46 +0000
Subject: [PATCH] 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/DSConfig.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
index 9a87e90..7584449 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
+++ b/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,9 +700,9 @@
if (batchFileArgument.isPresent() && !noPromptArgument.isPresent()) {
LocalizableMessage message =
- ERR_DSCFG_ERROR_BATCH_FILE_AND_INTERACTIVE_INCOMPATIBLE.get(
- batchFileArgument.getLongIdentifier(), noPromptArgument
- .getLongIdentifier());
+ ERR_DSCFG_ERROR_QUIET_AND_INTERACTIVE_INCOMPATIBLE.get(
+ batchFileArgument.getLongIdentifier(), noPromptArgument
+ .getLongIdentifier());
displayMessageAndUsageReference(message);
return 1;
}
--
Gitblit v1.10.0