From 2ad60cfec2ff93847fc648a335a9a8dced5060cd Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 17 Jul 2009 00:45:21 +0000
Subject: [PATCH] Update some messages to avoid using the term 'OpenDS'. This helps to make productization easier. Change the name of the return code CANCELLED to CANCELED to be consistent with the rest of the code.. When we start the server, use the administration port to connect to the server instead of the LDAP port, since we know that there is always an administration port but not necessarily an LDAP port.
---
opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java b/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
index 44ef134..1323cda 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
@@ -426,7 +426,7 @@
*/
boolean connected = false;
Configuration config = installation.getCurrentConfiguration();
- int port = config.getPort();
+ int port = config.getAdminConnectorPort();
String hostName = null;
if (application != null)
{
@@ -437,7 +437,7 @@
hostName = "localhost";
}
hostName = ConnectionUtils.getHostNameForLdapUrl(hostName);
- String ldapUrl = "ldap://"+hostName+":" + port;
+ String ldapUrl = "ldaps://"+hostName+":" + port;
// See if the application has prompted for credentials. If
// not we'll just try to connect anonymously.
@@ -459,20 +459,20 @@
{
// Try with local host. This might be necessary in certain
// network configurations.
- ldapUrl = "ldap://localhost:" + port;
+ ldapUrl = "ldaps://localhost:" + port;
}
if (i == 15)
{
// Try with 0.0.0.0. This might be necessary in certain
// network configurations.
- ldapUrl = "ldap://0.0.0.0:" + port;
+ ldapUrl = "ldaps://0.0.0.0:" + port;
}
try
{
- ctx = Utils.createLdapContext(
+ ctx = Utils.createLdapsContext(
ldapUrl,
userDn, userPw, ConnectionUtils.getDefaultLDAPTimeout(),
- null);
+ null, null);
connected = true;
}
catch (NamingException ne)
@@ -523,7 +523,6 @@
}
}
}
-
} catch (IOException ioe)
{
throw new ApplicationException(
--
Gitblit v1.10.0