From eee460507c52a633964f40b2b9ed797872fdc2e2 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 02 Aug 2016 07:40:40 +0000
Subject: [PATCH] use DN in the installer
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/AuthenticationData.java | 7 ++++---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java | 7 +++----
opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java | 4 ++--
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/DataReplicationOptions.java | 3 ++-
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/AuthenticationData.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/AuthenticationData.java
index 2914aad..7f689c7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/AuthenticationData.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/AuthenticationData.java
@@ -16,6 +16,7 @@
*/
package org.opends.quicksetup.installer;
+import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.HostPort;
/**
@@ -27,7 +28,7 @@
public class AuthenticationData
{
private HostPort hostPort = new HostPort(null, 0);
- private String dn;
+ private DN dn;
private String pwd;
private boolean useSecureConnection;
@@ -53,7 +54,7 @@
* Returns the Authentication DN.
* @return the Authentication DN.
*/
- public String getDn()
+ public DN getDn()
{
return dn;
}
@@ -62,7 +63,7 @@
* Sets the Authentication DN.
* @param dn the Authentication DN.
*/
- public void setDn(String dn)
+ public void setDn(DN dn)
{
this.dn = dn;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/DataReplicationOptions.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/DataReplicationOptions.java
index c671ed9..e70ecfa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/DataReplicationOptions.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/DataReplicationOptions.java
@@ -16,6 +16,7 @@
*/
package org.opends.quicksetup.installer;
+import org.forgerock.opendj.ldap.DN;
import org.opends.quicksetup.Constants;
import org.opends.quicksetup.util.Utils;
@@ -44,7 +45,7 @@
private boolean secureReplication;
private AuthenticationData authenticationData = new AuthenticationData();
{
- authenticationData.setDn(Constants.DIRECTORY_MANAGER_DN);
+ authenticationData.setDn(DN.valueOf(Constants.DIRECTORY_MANAGER_DN));
authenticationData.setPort(4444);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
index fc4d8ed..b8c8ce0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
@@ -2766,7 +2766,7 @@
private ConnectionWrapper createConnection(AuthenticationData auth) throws NamingException
{
String ldapUrl = auth.getLdapUrl();
- DN dn = DN.valueOf(auth.getDn());
+ DN dn = auth.getDn();
String pwd = auth.getPwd();
if (auth.useSecureConnection())
@@ -3265,7 +3265,7 @@
{
AuthenticationData auth = new AuthenticationData();
auth.setHostPort(new HostPort("".equals(host) ? null : host, port != null ? port : 0));
- auth.setDn(dn.toString());
+ auth.setDn(dn);
auth.setPwd(pwd);
auth.setUseSecureConnection(true);
@@ -4130,8 +4130,7 @@
}
server.setAdsProperties(adsProperties);
}
- return getRemoteConnection(server, DN.valueOf(auth.getDn()), auth.getPwd(), getConnectTimeout(),
- getPreferredConnections());
+ return getRemoteConnection(server, auth.getDn(), auth.getPwd(), getConnectTimeout(), getPreferredConnections());
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
index 9c78d53..0fb89e7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
@@ -1607,10 +1607,10 @@
cmdLine.add(String.valueOf(server.getEnabledAdministrationPorts().get(0)));
AuthenticationData authData = userData.getReplicationOptions().getAuthenticationData();
- if (!DN.valueOf(authData.getDn()).equals(ADSContext.getAdministratorDN(userData.getGlobalAdministratorUID())))
+ if (!authData.getDn().equals(ADSContext.getAdministratorDN(userData.getGlobalAdministratorUID())))
{
cmdLine.add("--bindDN1");
- cmdLine.add(authData.getDn());
+ cmdLine.add(authData.getDn().toString());
cmdLine.add("--bindPassword1");
cmdLine.add(OBFUSCATED_VALUE);
}
--
Gitblit v1.10.0