From f8bbdbbd3723605551b1de8856f032dd31e73153 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 25 Feb 2014 09:51:48 +0000
Subject: [PATCH] minor Checkpoint for OPENDJ-1303 "opendj-cli" - Replaced "quiet" argument by CommonArguments.getQuiet() on DirectoryServer / StopDS.
---
opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java | 6 +++---
opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java | 8 +++-----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
index 4358b19..0e8f040 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
@@ -82,6 +82,7 @@
import org.opends.server.workflowelement.WorkflowElementConfigManager;
import org.opends.server.workflowelement.localbackend.LocalBackendWorkflowElement;
+import com.forgerock.opendj.cli.ArgumentConstants;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
@@ -8879,8 +8880,7 @@
argParser.addArgument(noDetach);
- quietMode = new BooleanArgument("quiet", 'Q', "quiet",
- INFO_DESCRIPTION_QUIET.get());
+ quietMode = CommonArguments.getQuiet();
argParser.addArgument(quietMode);
@@ -9307,7 +9307,7 @@
BooleanArgument noDetach =
(BooleanArgument)argParser.getArgumentForLongID("nodetach");
BooleanArgument quietMode =
- (BooleanArgument)argParser.getArgumentForLongID("quiet");
+ (BooleanArgument)argParser.getArgumentForLongID(ArgumentConstants.OPTION_LONG_QUIET);
BooleanArgument windowsNetStart =
(BooleanArgument)argParser.getArgumentForLongID("windowsnetstart");
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java b/opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java
index 526134e..252b43c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java
@@ -60,6 +60,7 @@
import org.opends.server.util.args.LDAPConnectionArgumentParser;
import com.forgerock.opendj.cli.Argument;
+import com.forgerock.opendj.cli.ArgumentConstants;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
@@ -391,10 +392,7 @@
trustStorePWFile.setPropertyName(OPTION_LONG_TRUSTSTORE_PWD_FILE);
argParser.addArgument(trustStorePWFile);
- quietMode = new BooleanArgument("quiet", OPTION_SHORT_QUIET,
- OPTION_LONG_QUIET,
- INFO_DESCRIPTION_QUIET.get());
- quietMode.setPropertyName(OPTION_LONG_QUIET);
+ quietMode = CommonArguments.getQuiet();
argParser.addArgument(quietMode);
showUsage = CommonArguments.getShowUsage();
@@ -783,7 +781,7 @@
boolean isServerRunning;
boolean quietMode = false;
- Argument quietArg = argParser.getArgumentForLongID("quiet");
+ Argument quietArg = argParser.getArgumentForLongID(ArgumentConstants.OPTION_LONG_QUIET);
if ((quietArg != null) && quietArg.isPresent())
{
quietMode = true;
--
Gitblit v1.10.0