From 81909cf43111e8499c583395b66e96b6b74e6ab9 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 21 Feb 2014 13:50:22 +0000
Subject: [PATCH] Checkpoint OPENDJ-1343 Migrate dsconfig / OPENDJ-1303 "opendj-cli" - replaced arguments by CLI sdk CommonArguments.(Basic only, riskless to conflicting arguments) - reverted modifications on InstallDS/InstallDSArgumentParser about getDirectoryManagerPassword. - removed from toolconstants 'description' / 'memberName' (unused)

---
 opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java
index c6fa335..e9653fa 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java
@@ -48,15 +48,18 @@
 import org.forgerock.opendj.ldap.ByteString;
 import org.opends.server.util.EmbeddedUtils;
 import org.opends.server.util.PasswordReader;
+
 import com.forgerock.opendj.cli.ArgumentException;
 import com.forgerock.opendj.cli.ArgumentParser;
 import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
 import com.forgerock.opendj.cli.FileBasedArgument;
 import com.forgerock.opendj.cli.IntegerArgument;
 import com.forgerock.opendj.cli.StringArgument;
 
 import org.opends.server.controls.SubtreeDeleteControl;
 import org.forgerock.i18n.slf4j.LocalizedLogger;
+
 import static org.opends.messages.ToolMessages.*;
 import static org.opends.server.protocols.ldap.LDAPResultCode.*;
 import static org.opends.server.util.ServerConstants.*;
@@ -542,9 +545,7 @@
       noop.setPropertyName(OPTION_LONG_DRYRUN);
       argParser.addArgument(noop);
 
-      verbose = new BooleanArgument("verbose", 'v', "verbose",
-                                    INFO_DESCRIPTION_VERBOSE.get());
-      verbose.setPropertyName("verbose");
+      verbose = CommonArguments.getVerbose();
       argParser.addArgument(verbose);
 
       showUsage = new BooleanArgument("showUsage", OPTION_SHORT_HELP,

--
Gitblit v1.10.0