From 66ad41503e32e26e11405b497a9592d98e2d05a0 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 29 Aug 2007 17:54:56 +0000
Subject: [PATCH] Move the no option constant definition to ToolConstants. Refactor some code and put it in CliApplicationHelper. Fix some minor bugs in the output of the command-lines.
---
opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java b/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
index cda0628..bbd8ad5 100644
--- a/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
+++ b/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
@@ -164,18 +164,6 @@
// the trust manager.
private ApplicationTrustManager trustManager;
- /** Short form of the option for specifying a noninteractive session. */
- static public final Character NO_PROMPT_OPTION_SHORT = 'n';
-
- /** Long form of the option for specifying a quiet session. */
- static public final String QUIET_OPTION_LONG = "quiet";
-
- /** Long form of the option for specifying a noninteractive session. */
- static public final String NO_PROMPT_OPTION_LONG = "no-prompt";
-
- /** Short form of the option for specifying a quiet session. */
- static public final Character QUIET_OPTION_SHORT = 'Q';
-
/**
* The tracer object for the debug logger.
*/
@@ -451,7 +439,7 @@
INFO_DESCRIPTION_TRUSTSTOREPASSWORD.get());
set.add(trustStorePasswordArg);
- trustStorePasswordFileArg = new FileBasedArgument("truststorepasswordfile",
+ trustStorePasswordFileArg = new FileBasedArgument("truststorePasswordFile",
OPTION_SHORT_TRUSTSTORE_PWD_FILE, OPTION_LONG_TRUSTSTORE_PWD_FILE,
false, false, OPTION_VALUE_TRUSTSTORE_PWD_FILE, null, null,
INFO_DESCRIPTION_TRUSTSTOREPASSWORD_FILE.get());
@@ -469,7 +457,7 @@
INFO_DESCRIPTION_KEYSTOREPASSWORD.get());
set.add(keyStorePasswordArg);
- keyStorePasswordFileArg = new FileBasedArgument("keystorepasswordfile",
+ keyStorePasswordFileArg = new FileBasedArgument("keystorePasswordFile",
OPTION_SHORT_KEYSTORE_PWD_FILE, OPTION_LONG_KEYSTORE_PWD_FILE, false,
false, OPTION_VALUE_KEYSTORE_PWD_FILE, null, null,
INFO_DESCRIPTION_KEYSTOREPASSWORD_FILE.get());
--
Gitblit v1.10.0