From e22e8f74e6a96acd3975468f8d169b2a73004ccb Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 27 Aug 2009 09:33:13 +0000
Subject: [PATCH] Modify the code in order the adminPassword and the adminPasswordFile arguments in dsreplication to appear with the LDAP connection arguments.
---
opendj-sdk/opends/src/server/org/opends/server/tools/ToolConstants.java | 9 +++++++++
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java | 9 +++++----
opendj-sdk/opends/src/server/org/opends/server/util/cli/CommandBuilder.java | 10 ++++++----
opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java | 2 ++
4 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ToolConstants.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ToolConstants.java
index ed5f1fc..684598e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ToolConstants.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ToolConstants.java
@@ -635,6 +635,15 @@
*/
public static final String OPTION_LONG_ADMIN_UID = "adminUID";
+ /**
+ * Long form of admin password.
+ */
+ public static final String OPTION_LONG_ADMIN_PWD = "adminPassword";
+
+ /**
+ * Long form of admin password file.
+ */
+ public static final String OPTION_LONG_ADMIN_PWD_FILE = "adminPasswordFile";
/**
* Long form of report authorization ID connection option.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
index 4ec61a1..72f2982 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
@@ -512,15 +512,16 @@
secureArgsList.adminUidArg.setHidden(false);
defaultArgs.add(index++, secureArgsList.adminUidArg);
- secureArgsList.bindPasswordArg = new StringArgument("adminPassword",
- OPTION_SHORT_BINDPWD, "adminPassword", false, false, true,
+ secureArgsList.bindPasswordArg = new StringArgument(
+ OPTION_LONG_ADMIN_PWD.toLowerCase(),
+ OPTION_SHORT_BINDPWD, OPTION_LONG_ADMIN_PWD, false, false, true,
INFO_BINDPWD_PLACEHOLDER.get(), null, null,
INFO_DESCRIPTION_REPLICATION_ADMIN_BINDPASSWORD.get());
defaultArgs.add(index++, secureArgsList.bindPasswordArg);
secureArgsList.bindPasswordFileArg = new FileBasedArgument(
- "adminPasswordFile",
- OPTION_SHORT_BINDPWD_FILE, "adminPasswordFile", false, false,
+ OPTION_LONG_ADMIN_PWD_FILE.toLowerCase(),
+ OPTION_SHORT_BINDPWD_FILE, OPTION_LONG_ADMIN_PWD_FILE, false, false,
INFO_BINDPWD_FILE_PLACEHOLDER.get(), null, null,
INFO_DESCRIPTION_REPLICATION_ADMIN_BINDPASSWORDFILE.get());
defaultArgs.add(index++, secureArgsList.bindPasswordFileArg);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
index 1c1e412..0b1f81a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
@@ -1783,6 +1783,8 @@
OPTION_LONG_CERT_NICKNAME.equals(longId) ||
OPTION_LONG_REFERENCED_HOST_NAME.equals(longId) ||
OPTION_LONG_ADMIN_UID.equals(longId) ||
+ OPTION_LONG_ADMIN_PWD.equals(longId) ||
+ OPTION_LONG_ADMIN_PWD_FILE.equals(longId) ||
OPTION_LONG_REPORT_AUTHZ_ID.equals(longId) ||
OPTION_LONG_USE_PW_POLICY_CTL.equals(longId) ||
OPTION_LONG_USE_SASL_EXTERNAL.equals(longId) ||
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/cli/CommandBuilder.java b/opendj-sdk/opends/src/server/org/opends/server/util/cli/CommandBuilder.java
index 680ce4a..65867ad 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/cli/CommandBuilder.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/cli/CommandBuilder.java
@@ -51,10 +51,12 @@
private ArrayList<Argument> args = new ArrayList<Argument>();
private HashSet<Argument> obfuscatedArgs = new HashSet<Argument>();
- // The value used to display arguments that must be obfuscated (such as
- // passwords). This does not require localization (since the output of
- // command builder by its nature is not localized).
- private final static String OBFUSCATED_VALUE = "******";
+ /**
+ * The value used to display arguments that must be obfuscated (such as
+ * passwords). This does not require localization (since the output of
+ * command builder by its nature is not localized).
+ */
+ public final static String OBFUSCATED_VALUE = "******";
/**
* The constructor for the CommandBuilder.
--
Gitblit v1.10.0