From 6c2dae79767257aa61c05c36189489861ca6f0f0 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Thu, 06 Mar 2014 14:37:45 +0000
Subject: [PATCH] Checkpoint OPENDJ-1343 Migrate dsconfig - Removed the PasswordReader class as now we only support >JDK6   - Replaced calls to PasswordReader.readPassword to ConsoleApplication.readPassword() - Minor code cleanup / removed unused on the SecureConnectionCli class.

---
 opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
index b518c26..b0ebf13 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
@@ -48,12 +48,12 @@
 import org.forgerock.opendj.ldap.ByteString;
 import org.forgerock.opendj.ldap.ByteStringBuilder;
 import org.opends.server.util.EmbeddedUtils;
-import org.opends.server.util.PasswordReader;
 
 import com.forgerock.opendj.cli.ArgumentException;
 import com.forgerock.opendj.cli.ArgumentParser;
 import com.forgerock.opendj.cli.BooleanArgument;
 import com.forgerock.opendj.cli.CommonArguments;
+import com.forgerock.opendj.cli.ConsoleApplication;
 import com.forgerock.opendj.cli.FileBasedArgument;
 import com.forgerock.opendj.cli.IntegerArgument;
 import com.forgerock.opendj.cli.StringArgument;
@@ -647,7 +647,7 @@
         try
         {
           out.print(INFO_LDAPAUTH_PASSWORD_PROMPT.get(dn));
-          char[] pwChars = PasswordReader.readPassword();
+          char[] pwChars = ConsoleApplication.readPassword();
           //As per rfc 4513(section-5.1.2) a client should avoid sending
           //an empty password to the server.
           while(pwChars.length==0)
@@ -656,7 +656,7 @@
                 INFO_LDAPAUTH_NON_EMPTY_PASSWORD.get(),
                 MAX_LINE_WIDTH));
             out.print(INFO_LDAPAUTH_PASSWORD_PROMPT.get(dn));
-            pwChars = PasswordReader.readPassword();
+            pwChars = ConsoleApplication.readPassword();
           }
           pw = new String(pwChars);
         } catch(Exception ex)

--
Gitblit v1.10.0