mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Jean-Noël Rouvignac
12.26.2016 d915b1318351be440667daf4f19bb03103b75361
use DN in quicksetup

UserData now uses DN
7 files modified
71 ■■■■■ changed files
opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java 23 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java 6 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java 2 ●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java 12 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ServerController.java 4 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java 6 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java 18 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
@@ -16,12 +16,23 @@
 */
package org.opends.quicksetup;
import java.net.*;
import java.util.*;
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.Map;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.forgerock.opendj.config.ManagedObjectDefinition;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.server.config.client.BackendCfgClient;
import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.admin.ads.ServerDescriptor;
@@ -45,7 +56,7 @@
  private String serverLocation;
  private HostPort hostPort = new HostPort(null, 0);
  private int adminConnectorPort;
  private String directoryManagerDn;
  private DN directoryManagerDn;
  private String directoryManagerPwd;
  private String globalAdministratorUID;
  private String globalAdministratorPassword;
@@ -107,7 +118,7 @@
    setHostName(getDefaultHostName());
    setDirectoryManagerDn(Constants.DIRECTORY_MANAGER_DN);
    setDirectoryManagerDn(DN.valueOf(Constants.DIRECTORY_MANAGER_DN));
    setNewSuffixOptions(defaultNewSuffixOptions);
    DataReplicationOptions repl = DataReplicationOptions.createStandalone();
@@ -232,7 +243,7 @@
   * Returns the Directory Manager DN.
   * @return the Directory Manager DN.
   */
  public String getDirectoryManagerDn()
  public DN getDirectoryManagerDn()
  {
    return directoryManagerDn;
  }
@@ -241,7 +252,7 @@
   * Sets the new Directory Manager DN.
   * @param directoryManagerDn the new Directory Manager DN.
   */
  public void setDirectoryManagerDn(String directoryManagerDn)
  public void setDirectoryManagerDn(DN directoryManagerDn)
  {
    this.directoryManagerDn = directoryManagerDn;
  }
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
@@ -1225,7 +1225,7 @@
    }
    argList.add("-D");
    argList.add(getUserData().getDirectoryManagerDn());
    argList.add(getUserData().getDirectoryManagerDn().toString());
    argList.add("-w");
    argList.add(getUserData().getDirectoryManagerPwd());
@@ -3128,7 +3128,7 @@
    }
    else
    {
      getUserData().setDirectoryManagerDn(dmDn);
      getUserData().setDirectoryManagerDn(DN.valueOf(dmDn));
      qs.displayFieldInvalid(FieldName.DIRECTORY_MANAGER_DN, false);
    }
@@ -4087,7 +4087,7 @@
  {
    UserData uData = getUserData();
    HostPort hostPort = new HostPort(uData.getHostName(), uData.getAdminConnectorPort());
    DN dn = DN.valueOf(uData.getDirectoryManagerDn());
    DN dn = uData.getDirectoryManagerDn();
    String pwd = uData.getDirectoryManagerPwd();
    return new ConnectionWrapper(hostPort, LDAPS, dn, pwd, getConnectTimeout(), null);
  }
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
@@ -106,7 +106,7 @@
    setFieldValue(FieldName.SERVER_PORT, Integer.toString(userData.getServerPort()));
    setFieldValue(FieldName.ADMIN_CONNECTOR_PORT, Integer.toString(userData.getAdminConnectorPort()));
    setFieldValue(FieldName.SECURITY_OPTIONS, Utils.getSecurityOptionsString(userData.getSecurityOptions(), false));
    setFieldValue(FieldName.DIRECTORY_MANAGER_DN, userData.getDirectoryManagerDn());
    setFieldValue(FieldName.DIRECTORY_MANAGER_DN, userData.getDirectoryManagerDn().toString());
    setFieldValue(FieldName.DATA_OPTIONS, Utils.getDataDisplayString(userData));
    final boolean mustCreateAdministrator = userData.mustCreateAdministrator();
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java
@@ -16,6 +16,8 @@
 */
package org.opends.quicksetup.installer.ui;
import static org.opends.messages.QuickSetupMessages.*;
import java.awt.Component;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
@@ -33,6 +35,9 @@
import javax.swing.JPanel;
import javax.swing.text.JTextComponent;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.quicksetup.SecurityOptions;
import org.opends.quicksetup.UserData;
import org.opends.quicksetup.event.BrowseActionListener;
import org.opends.quicksetup.ui.FieldName;
import org.opends.quicksetup.ui.GuiApplication;
@@ -40,12 +45,7 @@
import org.opends.quicksetup.ui.QuickSetupStepPanel;
import org.opends.quicksetup.ui.UIFactory;
import org.opends.quicksetup.util.Utils;
import org.opends.quicksetup.SecurityOptions;
import org.opends.quicksetup.UserData;
import org.opends.server.util.CertificateManager;
import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.QuickSetupMessages.*;
/**
 * This is the panel that contains the Server Settings: the port, the Directory
@@ -337,7 +337,7 @@
      break;
    case DIRECTORY_MANAGER_DN:
      value = defaultUserData.getDirectoryManagerDn();
      value = defaultUserData.getDirectoryManagerDn().toString();
      break;
    case DIRECTORY_MANAGER_PWD:
opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ServerController.java
@@ -444,7 +444,7 @@
    // See if the application has prompted for credentials.  If
    // not we'll just try to connect anonymously.
    String userDn = null;
    DN userDn = null;
    String userPw = null;
    if (application != null) {
      userDn = application.getUserData().getDirectoryManagerDn();
@@ -467,7 +467,7 @@
          timeout = application.getUserData().getConnectTimeout();
        }
        try (ConnectionWrapper conn =
            new ConnectionWrapper(ldapUrl, Type.LDAPS, DN.valueOf(userDn), userPw, timeout, null))
            new ConnectionWrapper(ldapUrl, Type.LDAPS, userDn, userPw, timeout, null))
        {
          return;
        }
opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
@@ -1482,7 +1482,7 @@
    }
    cmdLine.add("--rootUserDN");
    cmdLine.add(userData.getDirectoryManagerDn());
    cmdLine.add(userData.getDirectoryManagerDn().toString());
    cmdLine.add("--rootUserPassword");
    cmdLine.add(OBFUSCATED_VALUE);
@@ -1633,7 +1633,7 @@
    cmdLine.add("--port2");
    cmdLine.add(String.valueOf(userData.getAdminConnectorPort()));
    cmdLine.add("--bindDN2");
    cmdLine.add(userData.getDirectoryManagerDn());
    cmdLine.add(userData.getDirectoryManagerDn().toString());
    cmdLine.add("--bindPassword2");
    cmdLine.add(OBFUSCATED_VALUE);
    if (replOptions.getReplicationPort() != -1)
@@ -1848,7 +1848,7 @@
    List<String> connectionArgs = newArrayList(
        "--hostName", userData.getHostName(),
        "--port", String.valueOf(userData.getAdminConnectorPort()),
        "--bindDN", userData.getDirectoryManagerDn(),
        "--bindDN", userData.getDirectoryManagerDn().toString(),
        "--bindPassword", OBFUSCATED_VALUE,
        "--trustAll",
        "--no-prompt",
opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
@@ -193,8 +193,8 @@
  private String lastResetKeyStorePath;
  private Boolean lastResetEnableWindowsService;
  private Boolean lastResetStartServer;
  private String lastResetBaseDN = Installation.DEFAULT_INTERACTIVE_BASE_DN;
  private String lastResetDirectoryManagerDN;
  private DN lastResetBaseDN = DN.valueOf(Installation.DEFAULT_INTERACTIVE_BASE_DN);
  private DN lastResetDirectoryManagerDN;
  private Integer lastResetLdapPort;
  private Integer lastResetLdapsPort;
  private Integer lastResetAdminConnectorPort;
@@ -289,7 +289,7 @@
      return InstallReturnCode.ERROR_UNEXPECTED.getReturnCode();
    }
    lastResetDirectoryManagerDN = argParser.directoryManagerDNArg.getDefaultValue();
    lastResetDirectoryManagerDN = DN.valueOf(argParser.directoryManagerDNArg.getDefaultValue());
    lastResetLdapPort = Integer.parseInt(argParser.ldapPortArg.getDefaultValue());
    lastResetLdapsPort = Integer.parseInt(argParser.ldapsPortArg.getDefaultValue());
    lastResetAdminConnectorPort = Integer.parseInt(argParser.adminConnectorPortArg.getDefaultValue());
@@ -661,7 +661,7 @@
      errorMessages.add(ERR_INSTALLDS_EMPTY_DN_RESPONSE.get());
    }
    checkBaseDN(dmDN, errorMessages);
    uData.setDirectoryManagerDn(argParser.directoryManagerDNArg.getValue());
    uData.setDirectoryManagerDn(DN.valueOf(argParser.directoryManagerDNArg.getValue()));
    // Check the validity of the directory manager password
    if (argParser.getDirectoryManagerPassword().isEmpty()) {
@@ -902,7 +902,7 @@
  {
    final LinkedList<String> dns = promptIfRequiredForDNs(
            argParser.directoryManagerDNArg, lastResetDirectoryManagerDN, INFO_INSTALLDS_PROMPT_ROOT_DN.get(), true);
    uData.setDirectoryManagerDn(dns.getFirst());
    uData.setDirectoryManagerDn(DN.valueOf(dns.getFirst()));
    int nTries = 0;
    String pwd = argParser.getDirectoryManagerPassword();
@@ -956,7 +956,7 @@
   * @throws UserDataException
   *           if something went wrong checking the data.
   */
  private LinkedList<String> promptIfRequiredForDNs(StringArgument arg, String valueToSuggest,
  private LinkedList<String> promptIfRequiredForDNs(StringArgument arg, DN valueToSuggest,
          LocalizableMessage promptMsg, boolean includeLineBreak) throws UserDataException
  {
    final LinkedList<String> dns = new LinkedList<>();
@@ -979,7 +979,7 @@
        }
        try
        {
          final String dn = readInput(promptMsg, valueToSuggest);
          final String dn = readInput(promptMsg, valueToSuggest.toString());
          firstPrompt = false;
          dns.add(dn);
          prompted = true;
@@ -2308,7 +2308,7 @@
        LocalizableMessage.raw(jmxPort != -1 ? String.valueOf(jmxPort) : ""),
        LocalizableMessage.raw(
            Utils.getSecurityOptionsString(uData.getSecurityOptions(), false)),
        LocalizableMessage.raw(uData.getDirectoryManagerDn()),
          LocalizableMessage.raw(uData.getDirectoryManagerDn().toString()),
        LocalizableMessage.raw(Utils.getDataDisplayString(uData)),
    };
    int maxWidth = 0;
@@ -2460,7 +2460,7 @@
      final LinkedList<String> baseDNs = uData.getNewSuffixOptions().getBaseDns();
      if (!baseDNs.isEmpty())
      {
        lastResetBaseDN = baseDNs.getFirst();
        lastResetBaseDN = DN.valueOf(baseDNs.getFirst());
      }
      final NewSuffixOptions suffixOptions = uData.getNewSuffixOptions();