From c0a6b7da7b64ef23f2fdc6655546dc344f6ae041 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.

---
 opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java b/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
index 4ec61a1..72f2982 100644
--- a/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
+++ b/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);

--
Gitblit v1.10.0