From 2ef798eb0532edd0d73872c15e9506c80d3bb7f4 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 28 Mar 2014 13:14:55 +0000
Subject: [PATCH] OPENDJ-1343 Migrate dsconfig / OPENDJ-1387 Removed dependency to LDAPManagementContextFactory.java.
---
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
index ace5bc2..d98aa15 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
@@ -73,7 +73,6 @@
import org.opends.quicksetup.util.ServerController;
import org.opends.quicksetup.util.Utils;
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
-import org.opends.server.tools.dsconfig.LDAPManagementContextFactory;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.cli.LDAPConnectionConsoleInteraction;
@@ -858,10 +857,9 @@
ci.setDisplayLdapIfSecureParameters(true);
}
- InitialLdapContext ctx = null;
try
{
- ci.run(true, false);
+ ci.run(alwaysSSL, false);
userData.setAdminUID(ci.getAdministratorUID());
userData.setAdminPwd(ci.getBindPassword());
@@ -887,9 +885,6 @@
{
logger.error(LocalizableMessage.raw("Error parsing url: "+adminConnectorUrl));
}
- LDAPManagementContextFactory factory =
- new LDAPManagementContextFactory(alwaysSSL);
- factory.getManagementContext(this, ci);
updateTrustManager(userData, ci);
info.setConnectionPolicy(ConnectionProtocolPolicy.USE_ADMIN);
@@ -915,10 +910,6 @@
printErrorMessage(e.getMessageObject());
println();
}
- finally
- {
- StaticUtils.close(ctx);
- }
if (!couldConnect)
{
--
Gitblit v1.10.0