From f298aaee8802d3eaad4ff712ed088546586388d8 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 24 Oct 2014 09:47:16 +0000
Subject: [PATCH] More code cleanup of ReplicationCliMain Removed utility methods that are just forwarding to other utility methods. Removed methods that have been ported to com.forgerock.opendj.cli.Utils.
---
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java
index a3d3941..fc84637 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java
@@ -26,15 +26,18 @@
*/
package org.opends.quicksetup.util;
-import static org.opends.messages.QuickSetupMessages.*;
-import static com.forgerock.opendj.cli.ArgumentConstants.*;
-import static com.forgerock.opendj.util.OperatingSystem.isWindows;
-import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Map;
+
+import javax.naming.NamingException;
+import javax.naming.ldap.InitialLdapContext;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.quicksetup.*;
import org.opends.quicksetup.installer.InstallerHelper;
import org.opends.server.util.SetupUtils;
@@ -42,14 +45,12 @@
import com.forgerock.opendj.cli.CliConstants;
-import javax.naming.NamingException;
-import javax.naming.ldap.InitialLdapContext;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
+import static com.forgerock.opendj.cli.Utils.*;
+import static com.forgerock.opendj.util.OperatingSystem.*;
-import java.util.ArrayList;
-import java.util.Map;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.IOException;
+import static org.opends.admin.ads.util.ConnectionUtils.*;
+import static org.opends.messages.QuickSetupMessages.*;
/**
* Class used to manipulate an OpenDS server.
@@ -467,7 +468,7 @@
hostName = "0.0.0.0";
}
- hostName = ConnectionUtils.getHostNameForLdapUrl(hostName);
+ hostName = getHostNameForLdapUrl(hostName);
String ldapUrl = "ldaps://"+hostName+":" + port;
try
{
@@ -476,10 +477,8 @@
{
timeout = application.getUserData().getConnectTimeout();
}
- ctx = Utils.createLdapsContext(
- ldapUrl,
- userDn, userPw, timeout,
- null, null);
+ ctx = createLdapsContext(ldapUrl, userDn, userPw, timeout,
+ null, null, null);
connected = true;
}
catch (NamingException ne)
--
Gitblit v1.10.0