From 0c41649927fe66913e2e3168f69e671bf7199987 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Wed, 04 Apr 2007 07:46:18 +0000
Subject: [PATCH] Fix CLI consistency issues: 1407 1408 1410 1411 1412 1413 1414 1416 1417 1418 1419 1420 1421
---
opends/src/server/org/opends/server/tools/ImportLDIF.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/ImportLDIF.java b/opends/src/server/org/opends/server/tools/ImportLDIF.java
index 5b68224..8dc717a 100644
--- a/opends/src/server/org/opends/server/tools/ImportLDIF.java
+++ b/opends/src/server/org/opends/server/tools/ImportLDIF.java
@@ -68,6 +68,7 @@
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
+import static org.opends.server.tools.ToolConstants.*;
@@ -162,8 +163,9 @@
try
{
configClass =
- new StringArgument("configclass", 'C', "configClass", true, false,
- true, "{configClass}",
+ new StringArgument("configclass", OPTION_SHORT_CONFIG_CLASS,
+ OPTION_LONG_CONFIG_CLASS, true, false,
+ true, OPTION_VALUE_CONFIG_CLASS,
ConfigFileHandler.class.getName(), null,
MSGID_LDIFIMPORT_DESCRIPTION_CONFIG_CLASS);
configClass.setHidden(true);
@@ -179,8 +181,9 @@
ldifFiles =
- new StringArgument("ldiffile", 'l', "ldifFile", false, true, true,
- "{ldifFile}", null, null,
+ new StringArgument("ldiffile", OPTION_SHORT_LDIF_FILE,
+ OPTION_LONG_LDIF_FILE, false, true, true,
+ OPTION_VALUE_LDIF_FILE, null, null,
MSGID_LDIFIMPORT_DESCRIPTION_LDIF_FILE);
argParser.addArgument(ldifFiles);
@@ -267,14 +270,16 @@
randomSeed =
- new IntegerArgument("randomseed", 'S', "randomSeed", false, false,
- true, "{seed}", 0, null, false, 0, false, 0,
+ new IntegerArgument("randomseed", OPTION_SHORT_RANDOM_SEED,
+ OPTION_LONG_RANDOM_SEED, false, false,
+ true, OPTION_VALUE_RANDOM_SEED,
+ 0, null, false, 0, false, 0,
MSGID_LDIFIMPORT_DESCRIPTION_RANDOM_SEED);
argParser.addArgument(randomSeed);
skipSchemaValidation =
- new BooleanArgument("skipschema", 's', "skipSchemaValidation",
+ new BooleanArgument("skipschema", 'S', "skipSchemaValidation",
MSGID_LDIFIMPORT_DESCRIPTION_SKIP_SCHEMA_VALIDATION);
argParser.addArgument(skipSchemaValidation);
@@ -297,7 +302,7 @@
displayUsage =
- new BooleanArgument("help", 'H', "help",
+ new BooleanArgument("help", OPTION_SHORT_HELP, OPTION_LONG_HELP,
MSGID_LDIFIMPORT_DESCRIPTION_USAGE);
argParser.addArgument(displayUsage);
argParser.setUsageArgument(displayUsage);
--
Gitblit v1.10.0