From c959146d66becd1bc0fe233668ef353452085dc3 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 07 Apr 2014 12:09:23 +0000
Subject: [PATCH] Checkpoint for OPENDJ-1303 "opendj-cli" - Fixed isDN function. - LDAPManagementContextFactory.java :removed the unused alwaysSSL var. - LDAPConnectionConsoleInteraction.java : -- removed unused parameter canUseSSL. -- modified the cannotReadConnectionParameters => more clearer. (thanks to JN) N.B This LDAPConnectionConsoleInteraction class will disapear as soon as the SDK will provide the same 'prompt' capabilities. (and also because the code is absolutely unmaintainable and redundant.)
---
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
index 1602302..82df3c5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
@@ -83,20 +83,14 @@
/** The connection parameters command builder. */
private CommandBuilder contextCommandBuilder;
- /** This CLI is always using the administration connector with SSL. */
- private boolean alwaysSSL = false;
-
/** Raw arguments. */
private String[] rawArgs;
/**
* Creates a new LDAP management context factory.
- *
- * @param alwaysSSL If true, always use the SSL connection type. In this case,
- * the arguments useSSL and startTLS are not present.
*/
- public LDAPManagementContextFactory(boolean alwaysSSL) {
- this.alwaysSSL = alwaysSSL;
+ public LDAPManagementContextFactory() {
+ // Nothing to do.
}
/** {@inheritDoc} */
@@ -258,7 +252,7 @@
public void registerGlobalArguments(SubCommandArgumentParser parser)
throws ArgumentException {
// Create the global arguments.
- secureArgsList = new SecureConnectionCliArgs(alwaysSSL);
+ secureArgsList = new SecureConnectionCliArgs(true);
LinkedHashSet<Argument> args = secureArgsList.createGlobalArguments();
--
Gitblit v1.10.0