From c465af5b01eb04b869326e58bdb3495830dcbb8f Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 01 Mar 2016 09:43:19 +0000
Subject: [PATCH] Fix bug in dsreplication and uninstall cli
---
opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
index 0788e76..0180111 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
@@ -75,7 +75,7 @@
/** The 'bindDN' global argument. */
public StringArgument bindDnArg;
/** The 'adminUID' global argument. */
- public StringArgument adminUidHiddenArg;
+ public StringArgument adminUidArg;
/** The 'bindPasswordFile' global argument. */
public FileBasedArgument bindPasswordFileArg;
/** The 'bindPassword' global argument. */
@@ -157,11 +157,11 @@
*/
public String getAdministratorUID()
{
- if (adminUidHiddenArg.isPresent())
+ if (adminUidArg.isPresent())
{
- return adminUidHiddenArg.getValue();
+ return adminUidArg.getValue();
}
- return adminUidHiddenArg.getDefaultValue();
+ return adminUidArg.getDefaultValue();
}
/**
@@ -173,7 +173,7 @@
*/
public boolean useAdminUID()
{
- return !adminUidHiddenArg.isHidden();
+ return !adminUidArg.isHidden();
}
/**
@@ -230,7 +230,7 @@
argList.add(bindDnArg);
// Classes that required admin UID to be not hidden must use CommonsArguments.adminUid().
- adminUidHiddenArg = adminUidHiddenArgument(INFO_DESCRIPTION_ADMIN_UID.get());
+ adminUidArg = adminUidHiddenArgument(INFO_DESCRIPTION_ADMIN_UID.get());
bindPasswordArg = bindPasswordArgument();
argList.add(bindPasswordArg);
@@ -646,6 +646,24 @@
}
}
+ /**
+ * Replace the admin UID argument by a non hidden one.
+ *
+ * @param description
+ * The localized description for the non hidden admin UID argument.
+ */
+ public void createVisibleAdminUidArgument(final LocalizableMessage description)
+ {
+ try
+ {
+ this.adminUidArg = adminUid(description);
+ }
+ catch (ArgumentException e)
+ {
+ // Will never append.
+ }
+ }
+
private IntegerArgument createPortArgument(final int defaultValue) throws ArgumentException
{
return portArgument(
--
Gitblit v1.10.0