From 609077ed606e3b094e303f298e8dca10567bc3e2 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Aug 2016 18:42:07 +0000
Subject: [PATCH] Partial OPENDJ-2625 Convert all code that uses JNDI to use the SDK instead
---
opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java
index 6bc9415..f7166e1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java
@@ -31,7 +31,6 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
-import java.net.URI;
import java.security.GeneralSecurityException;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
@@ -40,8 +39,6 @@
import java.util.TreeSet;
import java.util.concurrent.TimeUnit;
-import javax.naming.AuthenticationException;
-import javax.naming.NamingException;
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLException;
import javax.net.ssl.TrustManager;
@@ -53,6 +50,7 @@
import org.forgerock.opendj.config.LDAPProfile;
import org.forgerock.opendj.config.client.ManagementContext;
import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
+import org.forgerock.opendj.ldap.AuthenticationException;
import org.forgerock.opendj.ldap.AuthorizationException;
import org.forgerock.opendj.ldap.Connection;
import org.forgerock.opendj.ldap.DN;
@@ -84,7 +82,6 @@
import org.opends.server.util.cli.LDAPConnectionConsoleInteraction;
import com.forgerock.opendj.cli.ArgumentException;
-import com.forgerock.opendj.cli.CliConstants;
import com.forgerock.opendj.cli.ClientException;
import com.forgerock.opendj.cli.ConsoleApplication;
import com.forgerock.opendj.cli.IntegerArgument;
@@ -248,17 +245,7 @@
// LDAPConnectionConsoleInteraction, this done, it will not prompt
// the user for them.
controlInfo.setConnectionPolicy(ConnectionProtocolPolicy.USE_ADMIN);
- String ldapUrl = controlInfo.getAdminConnectorURL();
- int port = CliConstants.DEFAULT_ADMINISTRATION_CONNECTOR_PORT;
- try
- {
- final URI uri = new URI(ldapUrl);
- port = uri.getPort();
- }
- catch (Throwable t)
- {
- logger.error(LocalizableMessage.raw("Error parsing url: " + ldapUrl));
- }
+ int port = controlInfo.getAdminConnectorHostPort().getPort();
final SecureConnectionCliArgs secureArgsList = argParser.getSecureArgsList();
final StringArgument hostNameArg = secureArgsList.getHostNameArg();
hostNameArg.setPresent(true);
@@ -325,7 +312,7 @@
if (!controlInfo.getServerDescriptor().getExceptions().isEmpty()) {
return ReturnCode.ERROR_INITIALIZING_SERVER.get();
}
- } catch (NamingException |IOException e) {
+ } catch (IOException e) {
// This should not happen but this is useful information to
// diagnose the error.
println();
--
Gitblit v1.10.0