From a3529e8d0ca9206b9bef2c6dba418ca20ad06e8a Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 01 Apr 2014 09:11:13 +0000
Subject: [PATCH] OPENDJ-1303 Split out CLI support from opendj-ldap-toolkit into a separate Maven module, "opendj-cli" - Replaced ConnectionUtils.getDefaultLDAPTimeout() by CliConstants.DEFAULT_LDAP_CONNECT_TIMEOUT; - LDAPManagementContextFactory.java : code cleanup - removed unused code.
---
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 4a93141..fbf8d1e 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
@@ -40,8 +40,11 @@
import org.opends.server.util.SetupUtils;
import org.opends.server.util.StaticUtils;
+import com.forgerock.opendj.cli.CliConstants;
+
import javax.naming.NamingException;
import javax.naming.ldap.InitialLdapContext;
+
import java.util.ArrayList;
import java.util.Map;
import java.io.BufferedReader;
@@ -468,7 +471,7 @@
String ldapUrl = "ldaps://"+hostName+":" + port;
try
{
- int timeout = ConnectionUtils.getDefaultLDAPTimeout();
+ int timeout = CliConstants.DEFAULT_LDAP_CONNECT_TIMEOUT;
if (application != null)
{
if (application.getUserData() != null)
--
Gitblit v1.10.0